-diff -Nru gettext-0.10.35/doc/gettext.texi gettext-0.10.35.new/doc/gettext.texi
---- gettext-0.10.35/doc/gettext.texi Fri May 1 07:53:32 1998
-+++ gettext-0.10.35.new/doc/gettext.texi Fri Apr 9 18:09:45 1999
-@@ -7,13 +7,13 @@
+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 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
++* 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
-@@ -118,13 +118,13 @@
+@@ -156,16 +156,16 @@
- Making the Initial PO File
+ Making the PO Template File
-* xgettext Invocation:: Invoking the @code{xgettext} Program
-+* xgettext:: Invoking the @code{xgettext} Program
- * C Sources Context:: C Sources Context
- * Compendium:: Using Translation Compendiums
++* 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::
- * Fuzzy Entries:: Fuzzy translated Entries
++* msgmerge:: Invoking the @code{msgmerge} Program
+ * Translated Entries:: Translated Entries
+ * Fuzzy Entries:: Fuzzy Entries
* Untranslated Entries:: Untranslated Entries
-@@ -135,7 +135,7 @@
+@@ -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
-+* msgfmt:: 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
-@@ -195,7 +195,7 @@
+@@ -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
++* gettextize:: Invoking the @code{gettextize} Program
* Adjusting Files:: Files You Must Create or Alter
+ * autoconf macros:: Autoconf macros for use in @file{configure.in}
- Files You Must Create or Alter
-@@ -634,7 +634,7 @@
+@@ -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.
@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
-@@ -710,7 +710,7 @@
+@@ -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
@code{msgmerge} really does.
Whatever route or means taken, the goal is to obtain an updated
-@@ -736,9 +736,9 @@
+@@ -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 modalities of execution
--for the @code{msgfmt} program.
+-Invocation}, for more information about all modes of execution
+package, whenever needed at runtime (@pxref{MO Files}). @xref{msgfmt},
-+for more information about all modalities of execution for the @code{msgfmt}
-+program.
++for more information about all modes 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
-@@ -890,7 +890,7 @@
+@@ -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.
@end table
-@@ -1678,15 +1678,14 @@
- to use must contain the string @kbd{xgettext:no-c-format}.
+@@ -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. @xref{xgettext
--Invocation} to see how the @kbd{--debug} option can be used for solving
--this problem.
-+user can find out who is responsible for the decision. @xref{xgettext},
-+to see how the @kbd{--debug} option can be used for solving this problem.
+ 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
- @section Special Cases of Translatable Strings
-
- The attentive reader might now point out that it is not always possible
--to mark translatable string with @code{gettext} or something like this.
-+to mark translatable string with @code{gettext}, or something like this.
- Consider the following case:
-
- @example
-@@ -1710,7 +1709,7 @@
+@@ -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
can find them, and second we have to translate the string at runtime
before printing them.
-@@ -1740,8 +1739,7 @@
+@@ -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 above is of course not the only solution. You could also come along
with the following one:
-@@ -1783,12 +1781,12 @@
+@@ -2315,10 +2314,10 @@
@c FIXME: Rewrite.
@menu
-* xgettext Invocation:: Invoking the @code{xgettext} Program
-+* xgettext:: Invoking the @code{xgettext} Program
- * C Sources Context:: C Sources Context
- * Compendium:: Using Translation Compendiums
++* xgettext:: Invoking the @code{xgettext} Program
@end menu
--@node xgettext Invocation, C Sources Context, Initial, Initial
-+@node xgettext, C Sources Context, Initial, Initial
+-@node xgettext Invocation, , Template, Template
++@node xgettext, , Template, Template
@section Invoking the @code{xgettext} Program
- @c FIXME: Rewrite.
-@@ -1915,7 +1913,7 @@
- cases, like strings in preprocessor macros, ANSI concatenation of
- adjacent strings, and escaped end of lines for continued strings.
+ @include xgettext.texi
+@@ -2347,16 +2346,16 @@
+ the header entry of this file.
--@node C Sources Context, Compendium, xgettext Invocation, Initial
-+@node C Sources Context, Compendium, xgettext, Initial
- @section C Sources Context
+ @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
- PO mode is particularily powerful when used with PO files
-@@ -2040,7 +2038,7 @@
+-@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::
- * Fuzzy Entries::
++* msgmerge:: Invoking the @code{msgmerge} Program
+ * Translated Entries:: Translated Entries
+ * Fuzzy Entries:: Fuzzy Entries
* Untranslated Entries:: Untranslated Entries
-@@ -2050,7 +2048,7 @@
- * Auxiliary:: Consulting Auxiliary PO Files
+@@ -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
- @c FIXME: Rewrite.
-@@ -2642,11 +2640,11 @@
+ @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
-+* msgfmt:: 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, MO Files, Binaries, Binaries
-+@node msgfmt, MO Files, Binaries, Binaries
+-@node msgfmt Invocation, msgunfmt Invocation, Binaries, Binaries
++@node msgfmt, msgunfmt, Binaries, Binaries
@section Invoking the @code{msgfmt} Program
- @c FIXME: Rewrite.
-@@ -2722,7 +2720,7 @@
- If input file is @samp{-}, standard input is read. If output file
- is @samp{-}, output is written to standard output.
+ @include msgfmt.texi
--@node MO Files, , msgfmt Invocation, Binaries
-+@node MO Files, , msgfmt, Binaries
- @section The Format of GNU MO Files
+-@node msgunfmt Invocation, MO Files, msgfmt Invocation, Binaries
++@node msgunfmt, MO Files, msgfmt, Binaries
+ @section Invoking the @code{msgunfmt} Program
+
+ @include msgunfmt.texi
- The format of the generated MO files is best described by a picture,
-@@ -3078,7 +3076,7 @@
- method of normal file handling (open-use-close) and that it does not
- burden the programmer so many task, especially the unique key handling.
- Of course here is also a unique key needed, but this key is the
--message itself (how long or short it is). @xref{Comparison} for a
-+message itself (how long or short it is). @xref{Comparison}, for a
- more detailed comparison of the two methods.
-
- The following section contains a rather detailed description of the
-@@ -4146,7 +4144,7 @@
+-@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
++* 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
-
-@@ -4181,7 +4179,7 @@
- to flat distributions, we might add some notes about how to proceed
- in flat situations.
+@@ -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
-
- There are some works which are required for using GNU @code{gettext}
-@@ -4261,7 +4259,7 @@
+ @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.
@section Invoking the @code{gettextize} Program
Some files are consistently and identically needed in every package
-@@ -4353,7 +4351,7 @@
+@@ -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, , gettextize Invocation, Maintainers
-+@node Adjusting Files, , gettextize, Maintainers
+-@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
- Besides files which are automatically added through @code{gettextize},
projects / packages / gettext.git / blobdiff