- for 0.16: latest version from GNU TP (0.15-pre5) + my update

[packages/crossmingw32-gettext.git] / gettext-info.patch

diff --git a/gettext-info.patch b/gettext-info.patch
index 29bc52effb4314d62376ab1b3a91df5896008fd0..9520172807e03b4d50f1b4995cbb8ef324035bc6 100644 (file)
--- a/gettext-info.patch
+++ b/gettext-info.patch
@@ -1,68 +1,157 @@
-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 @@
- 
+--- gettext-0.15/gettext-tools/doc/gettext.texi.orig   2006-06-30 16:25:39.000000000 +0200
++++ gettext-0.15/gettext-tools/doc/gettext.texi        2006-07-27 19:02:53.450167750 +0200
+@@ -36,30 +36,30 @@

  @include version.texi
  
  @include version.texi
  

+ @ifinfo

 -@dircategory GNU Gettext Utilities
 +@dircategory Programming tools:
  @direntry
 -@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
+-* gettext: (gettext).                          GNU gettext utilities.
+-* autopoint: (gettext)autopoint Invocation.    Copy gettext infrastructure.
+-* envsubst: (gettext)envsubst Invocation.      Expand environment variables.
+-* gettextize: (gettext)gettextize Invocation.  Prepare a package for gettext.
+-* msgattrib: (gettext)msgattrib Invocation.    Select part of a PO file.
+-* msgcat: (gettext)msgcat Invocation.          Combine several PO files.
+-* msgcmp: (gettext)msgcmp Invocation.          Compare a PO file and template.
+-* msgcomm: (gettext)msgcomm Invocation.        Match two PO files.
+-* msgconv: (gettext)msgconv Invocation.        Convert PO file to encoding.
+-* msgen: (gettext)msgen Invocation.            Create an English PO file.
+-* msgexec: (gettext)msgexec Invocation.        Process a PO file.
+-* msgfilter: (gettext)msgfilter Invocation.    Pipe a PO file through a filter.
+-* msgfmt: (gettext)msgfmt Invocation.          Make MO files out of PO files.
+-* msggrep: (gettext)msggrep Invocation.        Select part of a PO file.
+-* msginit: (gettext)msginit Invocation.        Create a fresh PO file.
+-* msgmerge: (gettext)msgmerge Invocation.      Update a PO file from template.
+-* msgunfmt: (gettext)msgunfmt Invocation.      Uncompile MO file into PO file.
+-* msguniq: (gettext)msguniq Invocation.        Unify duplicates for PO file.
+-* ngettext: (gettext)ngettext Invocation.      Translate a message with plural.
+-* xgettext: (gettext)xgettext Invocation.      Extract strings into a PO file.
+-* ISO639: (gettext)Language Codes.             ISO 639 language codes.
+-* ISO3166: (gettext)Country Codes.             ISO 3166 country codes.
++* gettext: (gettext).                 GNU gettext utilities
++* autopoint: (gettext)autopoint.      Copy gettext infrastructure
++* envsubst: (gettext)envsubst.                Expand environment variables

 +* gettextize: (gettext)gettextize.    Prepare a package for gettext
 +* gettextize: (gettext)gettextize.    Prepare a package for gettext

++* msgattrib: (gettext)msgattrib.      Select part of a PO file
++* msgcat: (gettext)msgcat.            Combine several PO files
++* msgcmp: (gettext)msgcmp.            Compare a PO file and template
++* msgcomm: (gettext)msgcomm.          Match two PO files
++* msgconv: (gettext)msgconv.          Convert PO file to encoding
++* msgen: (gettext)msgen.              Create an English PO file
++* msgexec: (gettext)msgexec.          Process a PO file
++* msgfilter: (gettext)msgfilter.      Pipe a PO file through a filter

 +* msgfmt: (gettext)msgfmt.            Make MO files out of PO files
 +* msgfmt: (gettext)msgfmt.            Make MO files out of PO files

-+* msgmerge: (gettext)msgmerge.                Update two PO files into one
++* msggrep: (gettext)msggrep.          Select part of a PO file
++* msginit: (gettext)msginit.          Create a fresh PO file
++* msgmerge: (gettext)msgmerge.                Update a PO file from template
++* msgunfmt: (gettext)msgunfmt.                Uncompile MO file into PO file
++* msguniq: (gettext)msguniq.          Unify duplicates for PO file
++* ngettext: (gettext)ngettext.                Translate a message with plural

 +* xgettext: (gettext)xgettext.                Extract strings into a PO file
 +* xgettext: (gettext)xgettext.                Extract strings into a PO file

++* ISO639: (gettext)Language Codes.    ISO 639 language codes
++* ISO3166: (gettext)Country Codes.    ISO 3166 country codes

  @end direntry
  @end direntry

+ @end ifinfo

  
  

- @ifinfo
-@@ -120,11 +120,11 @@
+@@ -196,16 +196,16 @@

  
  Making the PO Template File
  
 -* xgettext Invocation::         Invoking the @code{xgettext} Program
  
  Making the PO Template File
  
 -* xgettext Invocation::         Invoking the @code{xgettext} Program

-+* xgettext::                  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
  
  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 @@
++* msgmerge::                    Invoking the @code{msgmerge} Program
+ 
+ Editing PO Files
+ 
+@@ -237,22 +237,22 @@
+ 
+ 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
+ * libgettextpo::                Writing your own programs that process PO files

  
  Producing Binary MO Files
  
 -* msgfmt Invocation::           Invoking the @code{msgfmt} 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
  
  * MO Files::                    The Format of GNU MO Files
  

- The User's View
-@@ -201,7 +201,7 @@
+ The Programmer's View
+@@ -310,7 +310,7 @@

  
  * Flat and Non-Flat::           Flat or Non-Flat Directory Structures
  * Prerequisites::               Prerequisite Works
 -* gettextize Invocation::       Invoking the @code{gettextize} Program
  
  * 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
  * Adjusting Files::             Files You Must Create or Alter

- 
- Files You Must Create or Alter
-@@ -649,7 +649,7 @@
+ * autoconf macros::             Autoconf macros for use in @file{configure.in}
+ * CVS Issues::                  Integrating with CVS
+@@ -343,7 +343,7 @@
+ 
+ * Distributed CVS::             Avoiding version mismatch in distributed development
+ * Files under CVS::             Files to put under CVS version control
+-* autopoint Invocation::        Invoking the @code{autopoint} Program
++* autopoint::                   Invoking the @code{autopoint} Program
+ 
+ Other Programming Languages
+ 
+@@ -406,10 +406,10 @@
+ * Preparing Shell Scripts::     Preparing Shell Scripts for Internationalization
+ * gettext.sh::                  Contents of @code{gettext.sh}
+ * gettext Invocation::          Invoking the @code{gettext} program
+-* ngettext Invocation::         Invoking the @code{ngettext} program
+-* envsubst Invocation::         Invoking the @code{envsubst} program
+-* eval_gettext Invocation::     Invoking the @code{eval_gettext} function
+-* eval_ngettext Invocation::    Invoking the @code{eval_ngettext} function
++* ngettext::                    Invoking the @code{ngettext} program
++* envsubst::                    Invoking the @code{envsubst} program
++* eval_gettext::                Invoking the @code{eval_gettext} function
++* eval_ngettext::               Invoking the @code{eval_ngettext} function
+ 
+ Perl
+ 
+@@ -936,7 +936,7 @@

  exactly where in C sources each string is used.  All translations
  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
+ are set to empty.  The letter @code{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
  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 @@
+@@ -1011,7 +1011,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
  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


@@ -71,38 +160,36 @@ diff -Nru gettext-0.10.36/doc/gettext.texi gettext-0.10.36.new/doc/gettext.texi
  @code{msgmerge} really does.
  
  Whatever route or means taken, the goal is to obtain an updated
  @code{msgmerge} really does.
  
  Whatever route or means taken, the goal is to obtain an updated

-@@ -751,9 +751,9 @@
+@@ -1035,8 +1035,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
  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},
 +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
  
  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 @@
+@@ -1235,7 +1235,7 @@

  
  

- In case the @kbd{c-format} flag is given for a string the @code{msgfmt}
+ In case the @code{c-format} flag is given for a string the @code{msgfmt}

  does some more tests to check to validity of the translation.
  does some more tests to check to validity of the translation.

--@xref{msgfmt Invocation}.
-+@xref{msgfmt}.
- 
- @end table
+-@xref{msgfmt Invocation}, @ref{c-format Flag} and @ref{c-format}.
++@xref{msgfmt}, @ref{c-format Flag} and @ref{c-format}.

  
  

-@@ -1726,7 +1726,7 @@
+ @item objc-format
+ @kwindex objc-format@r{ flag}
+@@ -2164,7 +2164,7 @@

  
  

- If a string is marked with @kbd{c-format} and this is not correct the
+ If a string is marked with @code{c-format} and this is not correct the

  user can find out who is responsible for the decision.  See
  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
+-@ref{xgettext Invocation} to see how the @code{--debug} option can be
++@ref{xgettext} to see how the @code{--debug} option can be

  used for solving this problem.
  
  used for solving this problem.
  

- @node Special cases,  , c-format, Sources
-@@ -1757,7 +1757,7 @@
+ @node Special cases, Names, c-format Flag, Sources
+@@ -2196,7 +2196,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
  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


@@ -111,7 +198,7 @@ diff -Nru gettext-0.10.36/doc/gettext.texi gettext-0.10.36.new/doc/gettext.texi
  can find them, and second we have to translate the string at runtime
  before printing them.
  
  can find them, and second we have to translate the string at runtime
  before printing them.
  

-@@ -1787,8 +1787,7 @@
+@@ -2226,8 +2226,7 @@

  
  Please convince yourself that the string which is written by
  @code{fputs} is translated in any case.  How to get @code{xgettext} know
  
  Please convince yourself that the string which is written by
  @code{fputs} is translated in any case.  How to get @code{xgettext} know


@@ -121,88 +208,191 @@ diff -Nru gettext-0.10.36/doc/gettext.texi gettext-0.10.36.new/doc/gettext.texi
  
  The above is of course not the only solution.  You could also come along
  with the following one:
  
  The above is of course not the only solution.  You could also come along
  with the following one:

-@@ -1833,10 +1832,10 @@
+@@ -2449,10 +2448,10 @@

  @c FIXME: Rewrite.
  
  @menu
 -* xgettext Invocation::         Invoking the @code{xgettext} Program
  @c FIXME: Rewrite.
  
  @menu
 -* xgettext Invocation::         Invoking the @code{xgettext} Program

-+* xgettext::                  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
  
  @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.
+ @include xgettext.texi
+@@ -2481,16 +2480,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
+ 
+@@ -2663,10 +2662,10 @@
+ @chapter Updating Existing PO Files

  
  @menu
 -* msgmerge Invocation::         Invoking the @code{msgmerge} Program
  
  @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
++* msgmerge::                    Invoking the @code{msgmerge} Program

  @end menu
  
  @end menu
  

--@node msgmerge Invocation, Translated Entries, Updating, Updating
-+@node msgmerge, Translated Entries, Updating, Updating
+-@node msgmerge Invocation,  , Updating, Updating
++@node msgmerge,  , Updating, Updating

  @section Invoking the @code{msgmerge} Program
  
  @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.
+ @include msgmerge.texi
+@@ -4206,70 +4205,70 @@
+ write other specialized programs that process PO files.
+ 
+ @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
+ * libgettextpo::                Writing your own programs that process PO files
+ @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 Translated Entries, Fuzzy Entries, msgmerge Invocation, Updating
-+@node Translated Entries, Fuzzy Entries, msgmerge, Updating
- @section Translated Entries
+-@node msguniq Invocation, msgcomm Invocation, msgfilter Invocation, Manipulating
++@node msguniq, msgcomm, msgfilter, Manipulating
+ @section Invoking the @code{msguniq} Program

  
  

- Each PO file entry for which the @code{msgstr} field has been filled with
-@@ -2874,11 +2873,11 @@
+ @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, libgettextpo, msgen Invocation, Manipulating
++@node msgexec, libgettextpo, msgen, Manipulating
+ @section Invoking the @code{msgexec} Program
+ 
+ @include msgexec.texi
+ 
+-@node libgettextpo,  , msgexec Invocation, Manipulating
++@node libgettextpo,  , msgexec, Manipulating
+ @section Writing your own programs that process PO files
+ 
+ For the tasks for which a combination of @samp{msgattrib}, @samp{msgcat} etc.
+@@ -4403,22 +4402,22 @@

  @c FIXME: Rewrite.
  
  @menu
 -* msgfmt Invocation::           Invoking the @code{msgfmt} Program
  @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
  
  * 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
  
  @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.
+ @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

  
  

- The format of the generated MO files is best described by a picture,
-@@ -4752,7 +4751,7 @@
+ @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}
+@@ -6407,7 +6406,7 @@

  @menu
  * Flat and Non-Flat::           Flat or Non-Flat Directory Structures
  * Prerequisites::               Prerequisite Works
 -* gettextize Invocation::       Invoking the @code{gettextize} Program
  @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
  * Adjusting Files::             Files You Must Create or Alter

- @end menu
- 
-@@ -4782,7 +4781,7 @@
+ * autoconf macros::             Autoconf macros for use in @file{configure.in}
+ * CVS Issues::                  Integrating with CVS
+@@ -6440,7 +6439,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
  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 @@
+ @cindex converting a package to use @code{gettext}
+ @cindex migration from earlier versions of @code{gettext}
+@@ -6525,12 +6524,12 @@

  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.
  
  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.
  


@@ -210,13 +400,138 @@ diff -Nru gettext-0.10.36/doc/gettext.texi gettext-0.10.36.new/doc/gettext.texi
 +@node gettextize, Adjusting Files, Prerequisites, Maintainers
  @section Invoking the @code{gettextize} Program
  
 +@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.
+ @include gettextize.texi

  
  

--@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
  @section Files You Must Create or Alter

+ @cindex @code{gettext} files
+ 
+@@ -6689,7 +6688,7 @@
+ Similarly, you can create rules for building message catalogs for the
+ @file{sr@@latin} locale -- Serbian written with the Latin alphabet --
+ from those for the @file{sr} locale -- Serbian written with Cyrillic
+-letters.  See @ref{msgfilter Invocation}.
++letters.  See @ref{msgfilter}.
+ 
+ @node configure.in, config.guess, po/Rules-*, Adjusting Files
+ @subsection @file{configure.in} at top level
+@@ -7406,7 +7405,7 @@
+ @menu
+ * Distributed CVS::             Avoiding version mismatch in distributed development
+ * Files under CVS::             Files to put under CVS version control
+-* autopoint Invocation::        Invoking the @code{autopoint} Program
++* autopoint::                   Invoking the @code{autopoint} Program
+ @end menu

  
  

- Besides files which are automatically added through @code{gettextize},
+ @node Distributed CVS, Files under CVS, CVS Issues, CVS Issues
+@@ -7448,7 +7447,7 @@
+ undiscovered due to this constellation.
+ @end itemize
+ 
+-@node Files under CVS, autopoint Invocation, Distributed CVS, CVS Issues
++@node Files under CVS, autopoint, Distributed CVS, CVS Issues
+ @subsection Files to put under CVS version control
+ 
+ There are basically three ways to deal with generated files in the
+@@ -7527,7 +7526,7 @@
+ use the CVS will henceforth need to have GNU @code{gettext} 0.12.1 or newer
+ installed.
+ 
+-@node autopoint Invocation,  , Files under CVS, CVS Issues
++@node autopoint,  , Files under CVS, CVS Issues
+ @subsection Invoking the @code{autopoint} Program
+ 
+ @include autopoint.texi
+@@ -8193,10 +8192,10 @@
+ * Preparing Shell Scripts::     Preparing Shell Scripts for Internationalization
+ * gettext.sh::                  Contents of @code{gettext.sh}
+ * gettext Invocation::          Invoking the @code{gettext} program
+-* ngettext Invocation::         Invoking the @code{ngettext} program
+-* envsubst Invocation::         Invoking the @code{envsubst} program
+-* eval_gettext Invocation::     Invoking the @code{eval_gettext} function
+-* eval_ngettext Invocation::    Invoking the @code{eval_ngettext} function
++* ngettext::                    Invoking the @code{ngettext} program
++* envsubst::                    Invoking the @code{envsubst} program
++* eval_gettext::                Invoking the @code{eval_gettext} function
++* eval_ngettext::               Invoking the @code{eval_ngettext} function
+ @end menu
+ 
+ @node Preparing Shell Scripts, gettext.sh, sh, sh
+@@ -8217,8 +8216,8 @@
+ 
+ near the top of the script.  @code{gettext.sh} is a shell function library
+ that provides the functions
+-@code{eval_gettext} (see @ref{eval_gettext Invocation}) and
+-@code{eval_ngettext} (see @ref{eval_ngettext Invocation}).
++@code{eval_gettext} (see @ref{eval_gettext}) and
++@code{eval_ngettext} (see @ref{eval_ngettext}).
+ You have to ensure that @code{gettext.sh} can be found in the @code{PATH}.
+ 
+ @item
+@@ -8328,28 +8327,28 @@
+ and a newline, without interpreting backslashes in the argument string.
+ 
+ @item eval_gettext
+-See @ref{eval_gettext Invocation}.
++See @ref{eval_gettext}.
+ 
+ @item eval_ngettext
+-See @ref{eval_ngettext Invocation}.
++See @ref{eval_ngettext}.
+ @end itemize
+ 
+-@node gettext Invocation, ngettext Invocation, gettext.sh, sh
++@node gettext Invocation, ngettext, gettext.sh, sh
+ @subsubsection Invoking the @code{gettext} program
+ 
+ @include rt-gettext.texi
+ 
+-@node ngettext Invocation, envsubst Invocation, gettext Invocation, sh
++@node ngettext, envsubst, gettext Invocation, sh
+ @subsubsection Invoking the @code{ngettext} program
+ 
+ @include rt-ngettext.texi
+ 
+-@node envsubst Invocation, eval_gettext Invocation, ngettext Invocation, sh
++@node envsubst, eval_gettext, ngettext, sh
+ @subsubsection Invoking the @code{envsubst} program
+ 
+ @include rt-envsubst.texi
+ 
+-@node eval_gettext Invocation, eval_ngettext Invocation, envsubst Invocation, sh
++@node eval_gettext, eval_ngettext, envsubst, sh
+ @subsubsection Invoking the @code{eval_gettext} function
+ 
+ @cindex @code{eval_gettext} function, usage
+@@ -8362,7 +8361,7 @@
+ performing dollar-substitution on the result.  Note that only shell variables
+ mentioned in @var{msgid} will be dollar-substituted in the result.
+ 
+-@node eval_ngettext Invocation,  , eval_gettext Invocation, sh
++@node eval_ngettext,  , eval_gettext, sh
+ @subsubsection Invoking the @code{eval_ngettext} function
+ 
+ @cindex @code{eval_ngettext} function, usage
+--- gettext-0.12.1/gettext-tools/doc/gettextize.texi.orig      2003-05-05 11:09:21.000000000 +0200
++++ gettext-0.12.1/gettext-tools/doc/gettextize.texi   2003-06-07 20:10:53.000000000 +0200
+@@ -177,4 +177,4 @@
+ of the GNU build system, in the sense that it should not be invoked
+ automatically, and not be invoked by someone who doesn't assume the
+ responsibilities of a package maintainer.  For the latter purpose, a
+-separate tool is provided, see @ref{autopoint Invocation}.
++separate tool is provided, see @ref{autopoint}.
+--- gettext-0.13/gettext-runtime/libasprintf/autosprintf.texi.orig     Fri May 30 16:30:21 2003
++++ gettext-0.13/gettext-runtime/libasprintf/autosprintf.texi  Mon Dec  1 15:52:12 2003
+@@ -15,9 +15,9 @@
+ @c %**end of header
+ @set VERSION 1.0
+ 
+-@dircategory C++ libraries
++@dircategory Libraries:
+ @direntry
+-* autosprintf: (autosprintf).   Support for printf format strings in C++.
++* autosprintf: (autosprintf).         Support for printf format strings in C++
+ @end direntry
+ 
+ @ifinfo