- updated to 0.20.1 (note: this version drops support for gettextize --intl)

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

--- gettext-0.20.1/gettext-tools/doc/gettext.texi.orig	2019-05-11 23:41:25.000000000 +0200
+++ gettext-0.20.1/gettext-tools/doc/gettext.texi	2019-06-18 17:43:19.826330748 +0200
@@ -47,30 +47,30 @@
 @include version.texi
 
 @ifinfo
-@dircategory GNU Gettext Utilities
+@dircategory Programming tools:
 @direntry
-* 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
+* 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
+* 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
+* ISO639: (gettext)Language Codes.	ISO 639 language codes
+* ISO3166: (gettext)Country Codes.	ISO 3166 country codes
 @end direntry
 @end ifinfo
 
@@ -216,16 +216,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
 
 Editing PO Files
 
@@ -257,16 +257,16 @@
 
 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
 * Colorizing::                  Highlighting parts of PO files
 * Other tools::                 Other tools for manipulating PO files
 * libgettextpo::                Writing your own programs that process PO files
@@ -281,8 +281,8 @@
 
 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 Programmer's View
@@ -341,7 +341,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.ac}
 * Version Control Issues::      
@@ -376,7 +376,7 @@
 * Distributed Development::     Avoiding version mismatch in distributed development
 * Files under Version Control::  Files to put under version control
 * Translations under Version Control::  Put PO Files under Version Control
-* autopoint Invocation::        Invoking the @code{autopoint} Program
+* autopoint::                   Invoking the @code{autopoint} Program
 
 Other Programming Languages
 
@@ -446,12 +446,12 @@
 * 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
-* eval_pgettext Invocation::    Invoking the @code{eval_pgettext} function
-* eval_npgettext Invocation::   Invoking the @code{eval_npgettext} 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
+* eval_pgettext::               Invoking the @code{eval_pgettext} function
+* eval_npgettext::              Invoking the @code{eval_npgettext} function
 
 Perl
 
@@ -1027,7 +1027,7 @@
 exactly where in C sources each string is used.  All translations
 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
@@ -1102,7 +1102,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
@@ -1126,8 +1126,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
@@ -1555,7 +1555,7 @@
 
 When the @code{c-format} flag is given for a string the @code{msgfmt}
 program does some more tests to check the validity of the translation.
-@xref{msgfmt Invocation}, @ref{c-format Flag} and @ref{c-format}.
+@xref{msgfmt}, @ref{c-format Flag} and @ref{c-format}.
 
 @item objc-format
 @kwindex objc-format@r{ flag}
@@ -2641,7 +2641,7 @@
 
 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
-@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.
 
 @node Special cases
@@ -2673,7 +2673,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.
 
@@ -2703,8 +2703,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:
@@ -3000,10 +2999,10 @@
 @c FIXME: Rewrite.
 
 @menu
-* xgettext Invocation::         Invoking the @code{xgettext} Program
+* xgettext::                    Invoking the @code{xgettext} Program
 @end menu
 
-@node xgettext Invocation
+@node xgettext
 @section Invoking the @code{xgettext} Program
 
 @include xgettext.texi
@@ -3032,11 +3031,11 @@
 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
+@node msginit
 @section Invoking the @code{msginit} Program
 
 @include msginit.texi
@@ -3268,10 +3267,10 @@
 @chapter Updating Existing PO Files
 
 @menu
-* msgmerge Invocation::         Invoking the @code{msgmerge} Program
+* msgmerge::                    Invoking the @code{msgmerge} Program
 @end menu
 
-@node msgmerge Invocation
+@node msgmerge
 @section Invoking the @code{msgmerge} Program
 
 @include msgmerge.texi
@@ -4811,67 +4810,67 @@
 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
 * Colorizing::                  Highlighting parts of PO files
 * Other tools::                 Other tools for manipulating PO files
 * libgettextpo::                Writing your own programs that process PO files
 @end menu
 
-@node msgcat Invocation
+@node msgcat
 @section Invoking the @code{msgcat} Program
 
 @include msgcat.texi
 
-@node msgconv Invocation
+@node msgconv
 @section Invoking the @code{msgconv} Program
 
 @include msgconv.texi
 
-@node msggrep Invocation
+@node msggrep
 @section Invoking the @code{msggrep} Program
 
 @include msggrep.texi
 
-@node msgfilter Invocation
+@node msgfilter
 @section Invoking the @code{msgfilter} Program
 
 @include msgfilter.texi
 
-@node msguniq Invocation
+@node msguniq
 @section Invoking the @code{msguniq} Program
 
 @include msguniq.texi
 
-@node msgcomm Invocation
+@node msgcomm
 @section Invoking the @code{msgcomm} Program
 
 @include msgcomm.texi
 
-@node msgcmp Invocation
+@node msgcmp
 @section Invoking the @code{msgcmp} Program
 
 @include msgcmp.texi
 
-@node msgattrib Invocation
+@node msgattrib
 @section Invoking the @code{msgattrib} Program
 
 @include msgattrib.texi
 
-@node msgen Invocation
+@node msgen
 @section Invoking the @code{msgen} Program
 
 @include msgen.texi
 
-@node msgexec Invocation
+@node msgexec
 @section Invoking the @code{msgexec} Program
 
 @include msgexec.texi
@@ -5436,17 +5435,17 @@
 @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
+@node msgfmt 
 @section Invoking the @code{msgfmt} Program
 
 @include msgfmt.texi
 
-@node msgunfmt Invocation
+@node msgunfmt
 @section Invoking the @code{msgunfmt} Program
 
 @include msgunfmt.texi
@@ -6365,7 +6364,7 @@
 The Unicode CLDR Project (@uref{http://cldr.unicode.org}) provides a
 comprehensive set of plural forms in a different format.  The
 @code{msginit} program has preliminary support for the format so you can
-use it as a baseline (@pxref{msginit Invocation}).}
+use it as a baseline (@pxref{msginit}).}
 
 @table @asis
 @item Only one form:
@@ -7719,7 +7718,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.ac}
 * Version Control Issues::      
@@ -7836,7 +7835,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
+@node gettextize
 @section Invoking the @code{gettextize} Program
 
 @include gettextize.texi
@@ -8002,7 +8001,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.ac
 @subsection @file{configure.ac} at top level
@@ -8615,7 +8614,7 @@
 to instruct @code{xgettext} to mark all translatable strings in @samp{gettext}
 invocations that occur as fifth argument to this function as @samp{c-format}.
 
-See @ref{xgettext Invocation} for the list of options that @code{xgettext}
+See @ref{xgettext} for the list of options that @code{xgettext}
 accepts.
 
 The use of this macro is an alternative to the use of the
@@ -8685,7 +8684,7 @@
 * Distributed Development::     Avoiding version mismatch in distributed development
 * Files under Version Control::  Files to put under version control
 * Translations under Version Control::  Put PO Files under Version Control
-* autopoint Invocation::        Invoking the @code{autopoint} Program
+* autopoint::                   Invoking the @code{autopoint} Program
 @end menu
 
 @node Distributed Development
@@ -8856,7 +8855,7 @@
 
 @end itemize
 
-@node autopoint Invocation
+@node autopoint
 @subsection Invoking the @code{autopoint} Program
 
 @include autopoint.texi
@@ -9592,12 +9591,12 @@
 * 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
-* eval_pgettext Invocation::    Invoking the @code{eval_pgettext} function
-* eval_npgettext Invocation::   Invoking the @code{eval_npgettext} 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
+* eval_pgettext::               Invoking the @code{eval_pgettext} function
+* eval_npgettext::              Invoking the @code{eval_npgettext} function
 @end menu
 
 @node Preparing Shell Scripts
@@ -9618,10 +9617,10 @@
 
 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}),
-@code{eval_ngettext} (see @ref{eval_ngettext Invocation}),
-@code{eval_pgettext} (see @ref{eval_pgettext Invocation}), and
-@code{eval_npgettext} (see @ref{eval_npgettext Invocation}).
+@code{eval_gettext} (see @ref{eval_gettext}),
+@code{eval_ngettext} (see @ref{eval_ngettext}),
+@code{eval_pgettext} (see @ref{eval_pgettext}), and
+@code{eval_npgettext} (see @ref{eval_npgettext}).
 You have to ensure that @code{gettext.sh} can be found in the @code{PATH}.
 
 @item
@@ -9731,16 +9730,16 @@
 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}.
 
 @item eval_pgettext
-See @ref{eval_pgettext Invocation}.
+See @ref{eval_pgettext}.
 
 @item eval_npgettext
-See @ref{eval_npgettext Invocation}.
+See @ref{eval_npgettext}.
 @end itemize
 
 @node gettext Invocation
@@ -9752,7 +9751,7 @@
 @code{gettext} invocation, where no options are present and the
 @var{textdomain} is implicit, from the environment.
 
-@node ngettext Invocation
+@node ngettext
 @subsubsection Invoking the @code{ngettext} program
 
 @include rt-ngettext.texi
@@ -9761,12 +9760,12 @@
 @code{ngettext} invocation, where no options are present and the
 @var{textdomain} is implicit, from the environment.
 
-@node envsubst Invocation
+@node envsubst
 @subsubsection Invoking the @code{envsubst} program
 
 @include rt-envsubst.texi
 
-@node eval_gettext Invocation
+@node eval_gettext
 @subsubsection Invoking the @code{eval_gettext} function
 
 @cindex @code{eval_gettext} function, usage
@@ -9779,7 +9778,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
+@node eval_ngettext
 @subsubsection Invoking the @code{eval_ngettext} function
 
 @cindex @code{eval_ngettext} function, usage
@@ -9793,7 +9792,7 @@
 on the result.  Note that only shell variables mentioned in @var{msgid} or
 @var{msgid-plural} will be dollar-substituted in the result.
 
-@node eval_pgettext Invocation
+@node eval_pgettext
 @subsubsection Invoking the @code{eval_pgettext} function
 
 @cindex @code{eval_pgettext} function, usage
@@ -9807,7 +9806,7 @@
 dollar-substitution on the result.  Note that only shell variables mentioned
 in @var{msgid} will be dollar-substituted in the result.
 
-@node eval_npgettext Invocation
+@node eval_npgettext
 @subsubsection Invoking the @code{eval_npgettext} function
 
 @cindex @code{eval_npgettext} function, usage
@@ -12564,7 +12563,7 @@
 Special Characters} data category can be used.
 
 To merge the translations, the @samp{msgfmt} program can be used with
-the option @code{--xml}.  @xref{msgfmt Invocation}, for more details
+the option @code{--xml}.  @xref{msgfmt}, for more details
 about how one calls the @samp{msgfmt} program.  @samp{msgfmt}'s
 @code{--xml} option doesn't perform character escaping, so translated
 strings can have arbitrary XML constructs, such as elements for markup.
@@ -12734,7 +12733,7 @@
 @subsection XML files
 
 See the section @ref{Preparing ITS Rules} and
-@ref{msgfmt Invocation}, subsection ``XML mode operations''.
+@ref{msgfmt}, subsection ``XML mode operations''.
 
 @node Conclusion
 @chapter Concluding Remarks
--- 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.17/gettext-runtime/libasprintf/autosprintf.texi.orig	2007-09-01 11:15:56.000000000 +0200
+++ gettext-0.17/gettext-runtime/libasprintf/autosprintf.texi	2007-11-07 22:19:42.123759307 +0100
@@ -23,9 +23,9 @@
 @set VERSION 1.0
 
 @ifinfo
-@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
 @end ifinfo
 
--- gettext-0.20.1/libtextstyle/doc/libtextstyle.texi.orig	2019-05-05 18:38:05.000000000 +0200
+++ gettext-0.20.1/libtextstyle/doc/libtextstyle.texi	2019-06-19 07:51:38.487255700 +0200
@@ -26,9 +26,9 @@
 @include version.texi
 
 @ifinfo
-@dircategory Software development
+@dircategory Programming tools:
 @direntry
-* GNU libtextstyle: (libtextstyle).     Output of styled text.
+* GNU libtextstyle: (libtextstyle).	Output of styled text
 @end direntry
 @end ifinfo