texinfo ChangeLog doc/Makefile.am doc/texinfo.txi

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/11/13 18:56:17

Modified files:
        .              : ChangeLog 
        doc            : Makefile.am texinfo.txi 

Log message:
        targets for updating the manuals in the www dir, name compatibility

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1439&r2=1.1440
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/Makefile.am?cvsroot=texinfo&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.488&r2=1.489

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1439
retrieving revision 1.1440
diff -u -b -r1.1439 -r1.1440
--- ChangeLog   13 Nov 2012 18:30:38 -0000      1.1439
+++ ChangeLog   13 Nov 2012 18:56:16 -0000      1.1440
@@ -1,5 +1,11 @@
 2012-11-13  Karl Berry  <address@hidden>
 
+       * doc/Makefile.am (wwwdoc-build, wwwdoc-install): new targets
+       for updating the manuals on the web.
+       
+       * doc/texinfo.txi (makeinfo options): lowercase o options
+       in compatibility @anchor, since that's what the 4.13 manual had.
+
        * tp/tests/tex_html_tests.sh, long_tests.sh, parser_base_tests:
        avoid [ ... ] and test ... -a ...
        * install-info/tests/*.test: use -x for better logging.

Index: doc/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/doc/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- doc/Makefile.am     17 May 2012 14:04:46 -0000      1.51
+++ doc/Makefile.am     13 Nov 2012 18:56:17 -0000      1.52
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.51 2012/05/17 14:04:46 pertusus Exp $
+# $Id: Makefile.am,v 1.52 2012/11/13 18:56:17 karl Exp $
 # Makefile.am for texinfo/doc.
 #
 # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
@@ -71,3 +71,40 @@
 
 # Do not create info files for distribution.
 dist-info:
+
+# Rules for updating the online web pages for the documentation
+# using the gendocs.sh script; see
+# http://www.gnu.org/prep/maintain/html_node/Invoking-gendocs_002esh.html
+#
+gnulib = $(HOME)/gnu/src/gnulib
+gendocs = $(gnulib)/build-aux/gendocs.sh
+gendocs_templates = $(gnulib)/doc
+gendocs_envvars = GENDOCS_TEMPLATE_DIR=$(gendocs_templates)
+gendocs_email = address@hidden
+gendocs_invoke = env $(gendocs_envvars) $(gendocs) --email $(gendocs_email)
+#
+manual1 = info
+manual1_title = "GNU Info manual"
+#
+manual2 = info-stnd
+manual2_title = "GNU standalone info manual"
+#
+manual3 = texinfo
+manual3_title = "GNU Texinfo manual"
+#
+doctemp = wwwtemp
+www_target = $(HOME)/gnu/www/texinfo/manual
+#
+wwwdoc-build:
+       rm -rf $(doctemp) && mkdir $(doctemp)
+       cd $(doctemp) \
+       && ln -s ../*.texi ../*.txi . \
+       && $(gendocs_invoke) -o $(manual1) $(manual1) $(manual1_title) \
+       && $(gendocs_invoke) -o $(manual2) $(manual2) $(manual2_title) \
+       && $(gendocs_invoke) -o $(manual3) $(manual3) $(manual3_title)
+       @echo "Manuals for web distribution under: $(doctemp)/"
+wwwdoc-install:
+       cp -arf $(doctemp)/$(manual1) $(doctemp)/$(manual2) \
+         $(doctemp)/$(manual3) $(www_target)
+       ls -ltu $(www_target)/*/html_node | tail  # cvs rm -f obsolete files
+# followed by cvs add of new files and cvs commit.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.488
retrieving revision 1.489
diff -u -b -r1.488 -r1.489
--- doc/texinfo.txi     8 Nov 2012 23:08:44 -0000       1.488
+++ doc/texinfo.txi     13 Nov 2012 18:56:17 -0000      1.489
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.488 2012/11/08 23:08:44 karl Exp $
address@hidden $Id: texinfo.txi,v 1.489 2012/11/13 18:56:17 karl Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -16584,7 +16584,7 @@
 You can specify more than one input file name; each is processed in
 turn.  If an input file name is @samp{-}, standard input is read.
 
address@hidden Options}
address@hidden options}
 @cindex @code{makeinfo} options
 @cindex Options for @code{makeinfo}
 @anchor{texi2any Options}
@@ -21649,7 +21649,7 @@
 or other version control systems, which expand it into a string such
 as:
 @example
-$Id: texinfo.txi,v 1.488 2012/11/08 23:08:44 karl Exp $
+$Id: texinfo.txi,v 1.489 2012/11/13 18:56:17 karl Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}