diff -Nur gettext-0.11.2.orig/doc/gettext.texi gettext-0.11.2/doc/gettext.texi --- gettext-0.11.2.orig/doc/gettext.texi Mon Apr 22 20:26:53 2002 +++ gettext-0.11.2/doc/gettext.texi Thu May 16 19:53:42 2002 @@ -31,13 +31,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 @@ -156,16 +156,16 @@ Making the PO Template File -* xgettext Invocation:: Invoking the @code{xgettext} Program +* xgettext:: Invoking the @code{xgettext} Program Creating a New PO File -* msginit Invocation:: Invoking the @code{msginit} Program +* msginit:: Invoking the @code{msginit} Program * Header Entry:: Filling in the Header Entry 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 @@ -184,21 +184,21 @@ Manipulating PO Files -* msgcat Invocation:: Invoking the @code{msgcat} Program -* msgconv Invocation:: Invoking the @code{msgconv} Program -* msggrep Invocation:: Invoking the @code{msggrep} Program -* msgfilter Invocation:: Invoking the @code{msgfilter} Program -* msguniq Invocation:: Invoking the @code{msguniq} Program -* msgcomm Invocation:: Invoking the @code{msgcomm} Program -* msgcmp Invocation:: Invoking the @code{msgcmp} Program -* msgattrib Invocation:: Invoking the @code{msgattrib} Program -* msgen Invocation:: Invoking the @code{msgen} Program -* msgexec Invocation:: Invoking the @code{msgexec} Program +* msgcat:: Invoking the @code{msgcat} Program +* msgconv:: Invoking the @code{msgconv} Program +* msggrep:: Invoking the @code{msggrep} Program +* msgfilter:: Invoking the @code{msgfilter} Program +* msguniq:: Invoking the @code{msguniq} Program +* msgcomm:: Invoking the @code{msgcomm} Program +* msgcmp:: Invoking the @code{msgcmp} Program +* msgattrib:: Invoking the @code{msgattrib} Program +* msgen:: Invoking the @code{msgen} Program +* msgexec:: Invoking the @code{msgexec} Program Producing Binary MO Files -* msgfmt Invocation:: Invoking the @code{msgfmt} Program -* msgunfmt Invocation:: Invoking the @code{msgunfmt} Program +* msgfmt:: Invoking the @code{msgfmt} Program +* msgunfmt:: Invoking the @code{msgunfmt} Program * MO Files:: The Format of GNU MO Files The User's View @@ -261,7 +261,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 * autoconf macros:: Autoconf macros for use in @file{configure.in} @@ -809,7 +809,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 @@ -886,7 +886,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 @@ -910,8 +910,8 @@ 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 modes of execution +package, whenever needed at runtime (@pxref{MO Files}). @xref{msgfmt}, +for more information about all modes of execution for the @code{msgfmt} program. Finally, the modified and marked C sources are compiled and linked @@ -1078,7 +1078,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 @@ -2208,7 +2208,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 @@ -2240,7 +2240,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. @@ -2270,8 +2270,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: @@ -2315,10 +2314,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 @include xgettext.texi @@ -2347,16 +2346,16 @@ the header entry of this file. @menu -* msginit Invocation:: Invoking the @code{msginit} Program +* msginit:: Invoking the @code{msginit} Program * Header Entry:: Filling in the Header Entry @end menu -@node msginit Invocation, Header Entry, Creating, Creating +@node msginit, Header Entry, Creating, Creating @section Invoking the @code{msginit} Program @include msginit.texi -@node Header Entry, , msginit Invocation, Creating +@node Header Entry, , msginit, Creating @section Filling in the Header Entry @cindex header entry of a PO file @@ -2507,7 +2506,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 @@ -2520,12 +2519,12 @@ * Compendium:: Using Translation Compendia @end menu -@node msgmerge Invocation, Translated Entries, Updating, Updating +@node msgmerge, Translated Entries, Updating, Updating @section Invoking the @code{msgmerge} Program @include msgmerge.texi -@node Translated Entries, Fuzzy Entries, msgmerge Invocation, Updating +@node Translated Entries, Fuzzy Entries, msgmerge, Updating @section Translated Entries @cindex translated entries @@ -3563,64 +3562,64 @@ catalogs. It copies each message's msgid to its msgstr. @menu -* msgcat Invocation:: Invoking the @code{msgcat} Program -* msgconv Invocation:: Invoking the @code{msgconv} Program -* msggrep Invocation:: Invoking the @code{msggrep} Program -* msgfilter Invocation:: Invoking the @code{msgfilter} Program -* msguniq Invocation:: Invoking the @code{msguniq} Program -* msgcomm Invocation:: Invoking the @code{msgcomm} Program -* msgcmp Invocation:: Invoking the @code{msgcmp} Program -* msgattrib Invocation:: Invoking the @code{msgattrib} Program -* msgen Invocation:: Invoking the @code{msgen} Program -* msgexec Invocation:: Invoking the @code{msgexec} Program +* msgcat:: Invoking the @code{msgcat} Program +* msgconv:: Invoking the @code{msgconv} Program +* msggrep:: Invoking the @code{msggrep} Program +* msgfilter:: Invoking the @code{msgfilter} Program +* msguniq:: Invoking the @code{msguniq} Program +* msgcomm:: Invoking the @code{msgcomm} Program +* msgcmp:: Invoking the @code{msgcmp} Program +* msgattrib:: Invoking the @code{msgattrib} Program +* msgen:: Invoking the @code{msgen} Program +* msgexec:: Invoking the @code{msgexec} Program @end menu -@node msgcat Invocation, msgconv Invocation, Manipulating, Manipulating +@node msgcat, msgconv, Manipulating, Manipulating @section Invoking the @code{msgcat} Program @include msgcat.texi -@node msgconv Invocation, msggrep Invocation, msgcat Invocation, Manipulating +@node msgconv, msggrep, msgcat, Manipulating @section Invoking the @code{msgconv} Program @include msgconv.texi -@node msggrep Invocation, msgfilter Invocation, msgconv Invocation, Manipulating +@node msggrep, msgfilter, msgconv, Manipulating @section Invoking the @code{msggrep} Program @include msggrep.texi -@node msgfilter Invocation, msguniq Invocation, msggrep Invocation, Manipulating +@node msgfilter, msguniq, msggrep, Manipulating @section Invoking the @code{msgfilter} Program @include msgfilter.texi -@node msguniq Invocation, msgcomm Invocation, msgfilter Invocation, Manipulating +@node msguniq, msgcomm, msgfilter, Manipulating @section Invoking the @code{msguniq} Program @include msguniq.texi -@node msgcomm Invocation, msgcmp Invocation, msguniq Invocation, Manipulating +@node msgcomm, msgcmp, msguniq, Manipulating @section Invoking the @code{msgcomm} Program @include msgcomm.texi -@node msgcmp Invocation, msgattrib Invocation, msgcomm Invocation, Manipulating +@node msgcmp, msgattrib, msgcomm, Manipulating @section Invoking the @code{msgcmp} Program @include msgcmp.texi -@node msgattrib Invocation, msgen Invocation, msgcmp Invocation, Manipulating +@node msgattrib, msgen, msgcmp, Manipulating @section Invoking the @code{msgattrib} Program @include msgattrib.texi -@node msgen Invocation, msgexec Invocation, msgattrib Invocation, Manipulating +@node msgen, msgexec, msgattrib, Manipulating @section Invoking the @code{msgen} Program @include msgen.texi -@node msgexec Invocation, , msgen Invocation, Manipulating +@node msgexec, , msgen, Manipulating @section Invoking the @code{msgexec} Program @include msgexec.texi @@ -3631,22 +3630,22 @@ @c FIXME: Rewrite. @menu -* msgfmt Invocation:: Invoking the @code{msgfmt} Program -* msgunfmt Invocation:: Invoking the @code{msgunfmt} Program +* msgfmt:: Invoking the @code{msgfmt} Program +* msgunfmt:: Invoking the @code{msgunfmt} Program * MO Files:: The Format of GNU MO Files @end menu -@node msgfmt Invocation, msgunfmt Invocation, Binaries, Binaries +@node msgfmt, msgunfmt, Binaries, Binaries @section Invoking the @code{msgfmt} Program @include msgfmt.texi -@node msgunfmt Invocation, MO Files, msgfmt Invocation, Binaries +@node msgunfmt, MO Files, msgfmt, Binaries @section Invoking the @code{msgunfmt} Program @include msgunfmt.texi -@node MO Files, , msgunfmt Invocation, Binaries +@node MO Files, , msgunfmt, Binaries @section The Format of GNU MO Files @cindex MO file's format @cindex file format, @file{.mo} @@ -5531,7 +5530,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 * autoconf macros:: Autoconf macros for use in @file{configure.in} @end menu @@ -5562,7 +5561,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 @cindex converting a package to use @code{gettext} @cindex migration from earlier versions of @code{gettext} @@ -5647,7 +5646,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 @@ -5768,7 +5767,7 @@ directory needs its own @file{Makefile}, and it has been designed so it can be identical in all packages. -@node Adjusting Files, autoconf macros, gettextize Invocation, Maintainers +@node Adjusting Files, autoconf macros, gettextize, Maintainers @section Files You Must Create or Alter @cindex @code{gettext} files