branch master updated: Fix/add @direntry for texi2any_api and texi2any_internals

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new d9a2aad6cc Fix/add @direntry for texi2any_api and texi2any_internals
d9a2aad6cc is described below

commit d9a2aad6ccab4e90758650873e3a13aac7a75872
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Oct 24 23:40:44 2022 +0200

    Fix/add @direntry for texi2any_api and texi2any_internals
    
    * doc/texi2any_api.texi, doc/tp_api/Makefile.am (EXTRA_DIST),
    texi2any_internals_preamble.texi: fix the texi2any_api @direntry
    to refer to texi2any_api.
    Add a @dircategory/@direntry to texi2any_internals by putting the
    preamble in texi2any_internals_preamble.texi and setting the
    preamble argument of pod2texi.
    Report from Andreas Schwab.
---
 ChangeLog              | 12 ++++++++++++
 doc/texi2any_api.texi  |  4 ++--
 doc/tp_api/Makefile.am |  6 +++---
 man/pod2texi.1         |  5 ++---
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ff66e1a5f2..0807c1f719 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2022-10-24  Patrice Dumas  <pertusus@free.fr>
+
+       Fix/add @direntry for texi2any_api and texi2any_internals
+
+       * doc/texi2any_api.texi, doc/tp_api/Makefile.am (EXTRA_DIST),
+       texi2any_internals_preamble.texi: fix the texi2any_api @direntry
+       to refer to texi2any_api.
+       Add a @dircategory/@direntry to texi2any_internals by putting the
+       preamble in texi2any_internals_preamble.texi and setting the
+       preamble argument of pod2texi.
+       Report from Andreas Schwab.
+
 2022-10-24  Patrice Dumas  <pertusus@free.fr>
 
        * Pod-Simple-Texinfo/pod2texi.pl, doc/tp_api/Makefile.am:
diff --git a/doc/texi2any_api.texi b/doc/texi2any_api.texi
index e17e5b43ca..a21d82835f 100644
--- a/doc/texi2any_api.texi
+++ b/doc/texi2any_api.texi
@@ -23,8 +23,8 @@ Texts.  A copy of the license is included in the section 
entitled
 
 @dircategory Texinfo documentation system
 @direntry
-* Texinfo texi2any customization: (customization_api).  Customizing texi2any
-                                            output using customization files
+* texi2any customization: (texi2any_api).
+                                Customizing texi2any output
 @end direntry
 
 @titlepage
diff --git a/doc/tp_api/Makefile.am b/doc/tp_api/Makefile.am
index 493c45682c..7f58f548d8 100644
--- a/doc/tp_api/Makefile.am
+++ b/doc/tp_api/Makefile.am
@@ -31,7 +31,7 @@ TEXINFO_TEX = ../texinfo.tex
 # them explicitly
 texi2any_internals_TEXINFOS = texi2any_internals_indices.texi
 #dist_texi2any_internals_TEXINFOS = 
-EXTRA_DIST = api_includes
+EXTRA_DIST = texi2any_internals_preamble.texi api_includes
 
 if BUILD_PERL_API_TEXI
 
@@ -60,7 +60,7 @@ texi2any_internals_dependencies = \
   $(top_srcdir)/tp/Texinfo/Convert/TexinfoXML.pm \
   $(top_srcdir)/tp/Texinfo/Convert/Plaintext.pm
 
-texi2any_internals.texi: $(texi2any_internals_dependencies) 
texi2any_internals_indices.texi
-       $(PERL) -I $(top_srcdir)/Pod-Simple-Texinfo/lib/ -I $(top_srcdir)/tp/ 
-I $(top_srcdir)/tp/maintain/lib/Text-Unidecode/lib/ -I 
$(top_srcdir)/tp/maintain/lib/libintl-perl/lib/ -I 
$(top_srcdir)/tp/maintain/lib/Unicode-EastAsianWidth/lib/ 
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=section --top 
'Texinfo modules documentation' --subdir=api_includes 
$(texi2any_internals_dependencies) | sed -e 's/^@bye/@__bye/' | sed -e 
'/^@__bye/r $(srcdir)/texi2any_internals_indices.texi' | se [...]
+texi2any_internals.texi: $(texi2any_internals_dependencies) 
texi2any_internals_indices.texi texi2any_internals_preamble.texi
+       $(PERL) -I $(top_srcdir)/Pod-Simple-Texinfo/lib/ -I $(top_srcdir)/tp/ 
-I $(top_srcdir)/tp/maintain/lib/Text-Unidecode/lib/ -I 
$(top_srcdir)/tp/maintain/lib/libintl-perl/lib/ -I 
$(top_srcdir)/tp/maintain/lib/Unicode-EastAsianWidth/lib/ 
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=section --preamble - 
--subdir=api_includes $(texi2any_internals_dependencies) < 
$(srcdir)/texi2any_internals_preamble.texi | sed -e 's/^@bye/@__bye/' | sed -e 
'/^@__bye/r $(srcdir)/texi2any_internal [...]
 
 endif
diff --git a/man/pod2texi.1 b/man/pod2texi.1
index 7c5cb422d4..8b5778c50f 100644
--- a/man/pod2texi.1
+++ b/man/pod2texi.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "POD2TEXI 1"
-.TH POD2TEXI 1 "2022-10-08" "perl v5.34.0" "User Contributed Perl 
Documentation"
+.TH POD2TEXI 1 "2022-10-24" "perl v5.34.0" "User Contributed Perl 
Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -214,8 +214,7 @@ boilerplate is a minimal beginning for a Texinfo document.
 .IP "\fB\-\-setfilename\fR=\fI\s-1STR\s0\fR" 4
 .IX Item "--setfilename=STR"
 Use \fI\s-1STR\s0\fR in top boilerplate before menu and includes for 
\f(CW@setfilename\fR.
-The default is based on the output file name.  This option is especially
-useful if the top boilerplate is output on the standard output.
+No \f(CW@setfilename\fR is output in the default case.
 .IP "\fB\-\-subdir\fR=\fI\s-1NAME\s0\fR" 4
 .IX Item "--subdir=NAME"
 If there is a main manual with include files (each corresponding to