Clarify single-letter options that take an optional argument.

diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog
index a493c7ffa3bb3f56028762c1d0228e8c84b5665e..0b8790f67609202a9224a6690fd74b6a4d8e1367 100644 (file)
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-20  Bruno Haible  <bruno@clisp.org>
+
+       * xgettext.texi: Clarify single-letter options that take an optional
+       argument: -c, -k, -m, -M.
+
 2008-03-10  Bruno Haible  <bruno@clisp.org>
 
        * gettext.texi (gettext Invocation): Mention that xgettext does not

diff --git a/gettext-tools/doc/xgettext.texi b/gettext-tools/doc/xgettext.texi
index c73ef3739ac421efff168c14591b756523894943..263dbc8cb9c9a8871de72198481c1b92f7085dcc 100644 (file)
--- a/gettext-tools/doc/xgettext.texi
+++ b/gettext-tools/doc/xgettext.texi
@@ -116,12 +116,13 @@ Join messages with existing file.
 Entries from @var{file} are not extracted.  @var{file} should be a PO or
 POT file.
 
-@item -c [@var{tag}]
+@item -c[@var{tag}]
 @itemx --add-comments[=@var{tag}]
 @opindex -c@r{, @code{xgettext} option}
 @opindex --add-comments@r{, @code{xgettext} option}
-Place comment block with @var{tag} (or those preceding keyword lines)
-in output file.
+Place comment blocks starting with @var{tag} and preceding keyword lines
+in the output file.  Without a @var{tag}, the option means to put @emph{all}
+comment blocks preceding keyword lines in the output file.
 
 @end table
 
@@ -138,12 +139,12 @@ This option has an effect with most languages, namely C, C++, ObjectiveC,
 Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, Tcl, Perl, PHP,
 GCC-source, Glade.
 
-@item -k @var{keywordspec}
+@item -k[@var{keywordspec}]
 @itemx --keyword[=@var{keywordspec}]
 @opindex -k@r{, @code{xgettext} option}
 @opindex --keyword@r{, @code{xgettext} option}
-Additional keyword to be looked for (without @var{keywordspec} means not to
-use default keywords).
+Specify @var{keywordspec} as an additional keyword to be looked for.
+Without a @var{keywordspec}, the option means to not use default keywords.
 
 @cindex adding keywords, @code{xgettext}
 @cindex context, argument specification in @code{xgettext}
@@ -484,17 +485,17 @@ which the translators can contact you.
 The default value is empty, which means that translators will be clueless!
 Don't forget to specify this option.
 
-@item -m [@var{string}]
+@item -m[@var{string}]
 @itemx --msgstr-prefix[=@var{string}]
 @opindex -m@r{, @code{xgettext} option}
 @opindex --msgstr-prefix@r{, @code{xgettext} option}
-Use @var{string} (or "" if not specified) as prefix for msgstr entries.
+Use @var{string} (or "" if not specified) as prefix for msgstr values.
 
-@item -M [@var{string}]
+@item -M[@var{string}]
 @itemx --msgstr-suffix[=@var{string}]
 @opindex -M@r{, @code{xgettext} option}
 @opindex --msgstr-suffix@r{, @code{xgettext} option}
-Use @var{string} (or "" if not specified) as suffix for msgstr entries.
+Use @var{string} (or "" if not specified) as suffix for msgstr values.
 
 @end table
 

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index b0e998fbd8b0f880cb8082bef96a75349556df1a..7053937ed45a68d047849eeeb9ec5d2f313f903c 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-20  Bruno Haible  <bruno@clisp.org>
+
+       * xgettext.c (usage): Clarify single-letter options that take an
+       optional argument: -c, -k, -m, -M.
+
 2008-04-16  Bruno Haible  <bruno@clisp.org>
 
        * msginit.c (catalogname_for_locale): Add entries for Maori, Uighur.

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index feef4200a6f454d9b30d1c0c91fd6524d3e44184..dc7af28789b0882bf52086ea8f4c7beac7052210 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -1,5 +1,5 @@
 /* Extracts strings from C source file to Uniforum style .po file.
-   Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2008 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, April 1995.
 
    This program is free software: you can redistribute it and/or modify
@@ -823,8 +823,10 @@ Operation mode:\n"));
       printf (_("\
   -x, --exclude-file=FILE.po  entries from FILE.po are not extracted\n"));
       printf (_("\
-  -c, --add-comments[=TAG]    place comment block with TAG (or those\n\
-                              preceding keyword lines) in output file\n"));
+  -cTAG, --add-comments=TAG   place comment blocks starting with TAG and\n\
+                                preceding keyword lines in output file\n\
+  -c, --add-comments          place all comment blocks preceding keyword lines\n\
+                                in output file\n"));
       printf ("\n");
       printf (_("\
 Language specific options:\n"));
@@ -835,8 +837,8 @@ Language specific options:\n"));
                                 Python, Lisp, EmacsLisp, librep, Scheme, Java,\n\
                                 C#, awk, Tcl, Perl, PHP, GCC-source, Glade)\n"));
       printf (_("\
-  -k, --keyword[=WORD]        additional keyword to be looked for (without\n\
-                              WORD means not to use default keywords)\n"));
+  -kWORD, --keyword=WORD      look for WORD as an additional keyword\n\
+  -k, --keyword               do not to use default keywords\n"));
       printf (_("\
                                 (only languages C, C++, ObjectiveC, Shell,\n\
                                 Python, Lisp, EmacsLisp, librep, Scheme, Java,\n\
@@ -909,9 +911,11 @@ Output details:\n"));
       printf (_("\
       --msgid-bugs-address=EMAIL@ADDRESS  set report address for msgid bugs\n"));
       printf (_("\
-  -m, --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr entries\n"));
+  -m[STRING], --msgstr-prefix[=STRING]  use STRING or \"\" as prefix for msgstr\n\
+                                values\n"));
       printf (_("\
-  -M, --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr entries\n"));
+  -M[STRING], --msgstr-suffix[=STRING]  use STRING or \"\" as suffix for msgstr\n\
+                                values\n"));
       printf ("\n");
       printf (_("\
 Informative output:\n"));