diff --git a/ChangeLog b/ChangeLog
index a12242aed435fbc3a84599acaf47bdd3b664dc11..42569b4a87ffd1bad2a26a9739897556839f1d70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2012-01-?? Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
+2012-01-30 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using CDI library version 1.5.4
* Version 1.5.4 released
diff --git a/NEWS b/NEWS
index f8dffef219a0b767c1812b3b0e806c9060839d55..9b174a6280eebff4a61d703d08144ca4c27cc055 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
CDO NEWS
--------
-Version 1.5.4 (?? January 2012):
+Version 1.5.4 (30 January 2012):
New features:
* setgridtype: added parameter lonlat to convert curvilinear to regular lon/lat grids
diff --git a/doc/cdo_refcard.pdf b/doc/cdo_refcard.pdf
index 1cca7aba8dd5388b6fcc870d7607f0494cabf51d..4e0081333d90e0bbd44a10a4b224df04ffd99d18 100644
Binary files a/doc/cdo_refcard.pdf and b/doc/cdo_refcard.pdf differ
diff --git a/doc/tex/cdoprog.tex b/doc/tex/cdoprog.tex
index 9a3ab8f26608acb7a3d7a5288371b4caa154d467..0b3e20f987bd48fc126bd0d8a81f5d5dc9664c71 100644
--- a/doc/tex/cdoprog.tex
+++ b/doc/tex/cdoprog.tex
@@ -41,7 +41,7 @@
\makebox[0.85in][l]{{\bf{-a}} } & \makebox[2.76in][l]{Generate an absolute time axis} \\ %\hline
\makebox[0.85in][l]{{\bf{-b}} $<\!nbits\!>$ } & \makebox[2.76in][l]{Set the number of bits for the output precision} \\
& (I8/I16/I32/F32/F64 for nc,nc2,nc4,nc4c; \\
- & F32/F64 for srv,ext,ieg; 1-24 for grb,grb2) \\
+ & F32/F64 for grb2,srv,ext,ieg; 1-24 for grb,grb2) \\
& Add L or B for Little or Big endian byteorder\\ %\hline
\makebox[0.85in][l]{{\bf{-f}} $<\!format\!>$ } & \makebox[2.76in][l]{Outputformat: grb,grb2,nc,nc2,nc4,nc4c,srv,ext,ieg} \\ %\hline
\makebox[0.85in][l]{{\bf{-g}} $<\!grid\!>$ } & \makebox[2.76in][l]{Grid or file name} \\
diff --git a/doc/tex/usage.tex b/doc/tex/usage.tex
index a115f50b6331e72bbbd9211d15c5fa9370783772..16167acdd5ea0ed5040039909767a46d3c4c241c 100644
--- a/doc/tex/usage.tex
+++ b/doc/tex/usage.tex
@@ -24,9 +24,9 @@ The following options are available for all operators:
\hline
\rowcolor{pcolor2}
\sl $<$format$>$ & \sl $<$nbits$>$ \\
- {\tt grb, grb2} & {\tt 1 - 24} \\
+ {\tt grb, grb2} & {\tt P1 - P24} \\
{\tt nc, nc2, nc4, nc4c} & {\tt I8/I16/I32/F32/F64} \\
- {\tt srv, ext, ieg} & {\tt F32/F64} \\
+ {\tt grb2, srv, ext, ieg} & {\tt F32/F64} \\
\hline
\end{tabular}
\vspace*{1mm}
diff --git a/src/cdo.c b/src/cdo.c
index d1d2cedcabb378bdf155933b21cb197daa93b910..1381d4b56754468fca05d73db4641da898d23564 100644
--- a/src/cdo.c
+++ b/src/cdo.c
@@ -187,7 +187,7 @@ void usage(void)
fprintf(stderr, " Options:\n");
fprintf(stderr, " -a Generate an absolute time axis\n");
fprintf(stderr, " -b <nbits> Set the number of bits for the output precision\n");
- fprintf(stderr, " (I8/I16/I32/F32/F64 for nc/nc2/nc4/nc4c; F32/F64 for srv/ext/ieg; 1 - 24 for grb/grb2)\n");
+ fprintf(stderr, " (I8/I16/I32/F32/F64 for nc/nc2/nc4/nc4c; F32/F64 for grb2/srv/ext/ieg; P1 - P24 for grb/grb2)\n");
fprintf(stderr, " Add L or B to set the byteorder to Little or Big endian\n");
fprintf(stderr, " -f <format> Format of the output file. (grb/grb2/nc/nc2/nc4/nc4c/srv/ext/ieg)\n");
fprintf(stderr, " -g <grid> Set default grid name or file. Available grids: \n");
@@ -409,7 +409,7 @@ void setDefaultDataType(char *datatypestr)
else
{
fprintf(stderr, "Unsupported number of bits %d!\n", nbits);
- fprintf(stderr, "Use I8/I16/I32/F32/F64 for nc/nc2/nc4/nc4c; F32/F64 for srv/ext/ieg; 1 - 24 for grb/grb2.\n");
+ fprintf(stderr, "Use I8/I16/I32/F32/F64 for nc/nc2/nc4/nc4c; F32/F64 for grb2/srv/ext/ieg; P1 - P24 for grb/grb2.\n");
exit(EXIT_FAILURE);
}
}
@@ -568,7 +568,7 @@ void setDefaultFileType(char *filetypestr, int labort)
fprintf(stderr, "Unexpected character >%c< in file type >%s<!\n", *ftstr, filetypestr);
fprintf(stderr, "Use format[_nbits] with:\n");
fprintf(stderr, " format = grb, grb2, nc, nc2, nc4, nc4c, srv, ext or ieg\n");
- fprintf(stderr, " nbits = 32/64 for nc/nc2/nc4/nc4c/srv/ext/ieg; 1 - 24 for grb/grb2\n");
+ fprintf(stderr, " nbits = 32/64 for grb2/nc/nc2/nc4/nc4c/srv/ext/ieg; 1 - 24 for grb/grb2\n");
exit(EXIT_FAILURE);
}
}