diff -Nru gettext-0.10.36/doc/gettext.texi gettext-0.10.36.new/doc/gettext.texi --- gettext-0.10.36/doc/gettext.texi Thu Mar 29 17:51:51 2001 +++ gettext-0.10.36.new/doc/gettext.texi Wed Apr 4 01:11:29 2001 @@ -7,13 +7,13 @@ @include version.texi -@dircategory GNU Gettext Utilities +@dircategory Programming tools: @direntry -* Gettext: (gettext). GNU gettext utilities. -* gettextize: (gettext)gettextize Invocation. Prepare a package for gettext. -* msgfmt: (gettext)msgfmt Invocation. Make MO files out of PO files. -* msgmerge: (gettext)msgmerge Invocation. Update two PO files into one. -* xgettext: (gettext)xgettext Invocation. Extract strings into a PO file. +* Gettext: (gettext). GNU gettext utilities +* gettextize: (gettext)gettextize. Prepare a package for gettext +* msgfmt: (gettext)msgfmt. Make MO files out of PO files +* msgmerge: (gettext)msgmerge. Update two PO files into one +* xgettext: (gettext)xgettext. Extract strings into a PO file @end direntry @ifinfo @@ -120,11 +120,11 @@ Making the PO Template File -* xgettext Invocation:: Invoking the @code{xgettext} Program +* xgettext:: Invoking the @code{xgettext} Program Updating Existing PO Files -* msgmerge Invocation:: Invoking the @code{msgmerge} Program +* msgmerge:: Invoking the @code{msgmerge} Program * Translated Entries:: Translated Entries * Fuzzy Entries:: Fuzzy Entries * Untranslated Entries:: Untranslated Entries @@ -138,7 +138,7 @@ Producing Binary MO Files -* msgfmt Invocation:: Invoking the @code{msgfmt} Program +* msgfmt:: Invoking the @code{msgfmt} Program * MO Files:: The Format of GNU MO Files The User's View @@ -201,7 +201,7 @@ * Flat and Non-Flat:: Flat or Non-Flat Directory Structures * Prerequisites:: Prerequisite Works -* gettextize Invocation:: Invoking the @code{gettextize} Program +* gettextize:: Invoking the @code{gettextize} Program * Adjusting Files:: Files You Must Create or Alter Files You Must Create or Alter @@ -649,7 +649,7 @@ exactly where in C sources each string is used. All translations are set to empty. The letter @kbd{t} in @file{.pot} marks this as a Template PO file, not yet oriented towards any particular language. -@xref{xgettext Invocation}, for more details about how one calls the +@xref{xgettext}, for more details about how one calls the @code{xgettext} program. If you are @emph{really} lazy, you might be interested at working a lot more right away, and preparing the whole distribution setup (@pxref{Maintainers}). By doing so, you @@ -725,7 +725,7 @@ which are no longer used in the program sources (@pxref{Obsolete Entries}). It finally discovers new strings and inserts them in the resulting PO file as untranslated entries (@pxref{Untranslated -Entries}). @xref{msgmerge Invocation}, for more information about what +Entries}). @xref{msgmerge}, for more information about what @code{msgmerge} really does. Whatever route or means taken, the goal is to obtain an updated @@ -751,9 +751,9 @@ Once the PO file is complete and dependable, the @code{msgfmt} program is used for turning the PO file into a machine-oriented format, which may yield efficient retrieval of translations by the programs of the -package, whenever needed at runtime (@pxref{MO Files}). @xref{msgfmt -Invocation}, for more information about all modalities of execution -for the @code{msgfmt} program. +package, whenever needed at runtime (@pxref{MO Files}). @xref{msgfmt}, +for more information about all modalities of execution for the @code{msgfmt} +program. Finally, the modified and marked C sources are compiled and linked with the GNU @code{gettext} library, usually through the operation of @@ -908,7 +908,7 @@ In case the @kbd{c-format} flag is given for a string the @code{msgfmt} does some more tests to check to validity of the translation. -@xref{msgfmt Invocation}. +@xref{msgfmt}. @end table @@ -1726,7 +1726,7 @@ If a string is marked with @kbd{c-format} and this is not correct the user can find out who is responsible for the decision. See -@ref{xgettext Invocation} to see how the @kbd{--debug} option can be +@ref{xgettext} to see how the @kbd{--debug} option can be used for solving this problem. @node Special cases, , c-format, Sources @@ -1757,7 +1757,7 @@ While it is no problem to mark the string @code{"a default message"} it is not possible to mark the string initializers for @code{messages}. What is to be done? We have to fulfill two tasks. First we have to mark the -strings so that the @code{xgettext} program (@pxref{xgettext Invocation}) +strings so that the @code{xgettext} program (@pxref{xgettext}) can find them, and second we have to translate the string at runtime before printing them. @@ -1787,8 +1787,7 @@ Please convince yourself that the string which is written by @code{fputs} is translated in any case. How to get @code{xgettext} know -the additional keyword @code{gettext_noop} is explained in @ref{xgettext -Invocation}. +the additional keyword @code{gettext_noop} is explained in @ref{xgettext}. The above is of course not the only solution. You could also come along with the following one: @@ -1833,10 +1832,10 @@ @c FIXME: Rewrite. @menu -* xgettext Invocation:: Invoking the @code{xgettext} Program +* xgettext:: Invoking the @code{xgettext} Program @end menu -@node xgettext Invocation, , Template, Template +@node xgettext, , Template, Template @section Invoking the @code{xgettext} Program @c FIXME: Rewrite. @@ -2119,7 +2118,7 @@ @c FIXME: Rewrite. @menu -* msgmerge Invocation:: Invoking the @code{msgmerge} Program +* msgmerge:: Invoking the @code{msgmerge} Program * Translated Entries:: Translated Entries * Fuzzy Entries:: Fuzzy Entries * Untranslated Entries:: Untranslated Entries @@ -2132,7 +2131,7 @@ * Compendium:: Using Translation Compendiums @end menu -@node msgmerge Invocation, Translated Entries, Updating, Updating +@node msgmerge, Translated Entries, Updating, Updating @section Invoking the @code{msgmerge} Program @c FIXME: Rewrite. @@ -2156,7 +2155,7 @@ @c so marking the entry as obsolete, and giving the modified string with @c an empty translation, that is, marking the entry as untranslated. -@node Translated Entries, Fuzzy Entries, msgmerge Invocation, Updating +@node Translated Entries, Fuzzy Entries, msgmerge, Updating @section Translated Entries Each PO file entry for which the @code{msgstr} field has been filled with @@ -2874,11 +2873,11 @@ @c FIXME: Rewrite. @menu -* msgfmt Invocation:: Invoking the @code{msgfmt} Program +* msgfmt:: Invoking the @code{msgfmt} Program * MO Files:: The Format of GNU MO Files @end menu -@node msgfmt Invocation, MO Files, Binaries, Binaries +@node msgfmt, MO Files, Binaries, Binaries @section Invoking the @code{msgfmt} Program @c FIXME: Rewrite. @@ -2954,7 +2953,7 @@ If input file is @samp{-}, standard input is read. If output file is @samp{-}, output is written to standard output. -@node MO Files, , msgfmt Invocation, Binaries +@node MO Files, , msgfmt, Binaries @section The Format of GNU MO Files The format of the generated MO files is best described by a picture, @@ -4752,7 +4751,7 @@ @menu * Flat and Non-Flat:: Flat or Non-Flat Directory Structures * Prerequisites:: Prerequisite Works -* gettextize Invocation:: Invoking the @code{gettextize} Program +* gettextize:: Invoking the @code{gettextize} Program * Adjusting Files:: Files You Must Create or Alter @end menu @@ -4782,7 +4781,7 @@ described in the remaining of this chapter. Some maintainers might use this as an opportunity to unflatten their package structure. -@node Prerequisites, gettextize Invocation, Flat and Non-Flat, Maintainers +@node Prerequisites, gettextize, Flat and Non-Flat, Maintainers @section Prerequisite Works There are some works which are required for using GNU @code{gettext} @@ -4862,7 +4861,7 @@ a maintainer, ever think there is a real problem with a team, please never try to @emph{solve} a team's problem on your own. -@node gettextize Invocation, Adjusting Files, Prerequisites, Maintainers +@node gettextize, Adjusting Files, Prerequisites, Maintainers @section Invoking the @code{gettextize} Program Some files are consistently and identically needed in every package @@ -4954,7 +4953,7 @@ directory needs its own @file{Makefile}, and it has been designed so it can be identical in all packages. -@node Adjusting Files, , gettextize Invocation, Maintainers +@node Adjusting Files, , gettextize, Maintainers @section Files You Must Create or Alter Besides files which are automatically added through @code{gettextize},