texinfo ChangeLog doc/texinfo.txi util/htmlxref...

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/12/14 17:24:05

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 
        util           : htmlxref.cnf 

Log message:
        (Other Configuration Variables): continue

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1190&r2=1.1191
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.358&r2=1.359
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/htmlxref.cnf?cvsroot=texinfo&r1=1.40&r2=1.41

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1190
retrieving revision 1.1191
diff -u -b -r1.1190 -r1.1191
--- ChangeLog   9 Dec 2010 18:37:39 -0000       1.1190
+++ ChangeLog   14 Dec 2010 17:23:59 -0000      1.1191
@@ -1,3 +1,7 @@
+2010-12-14  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Other Configuration Variables): continue.
+
 2010-12-09  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (Other Configuration Variables): begin reading.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -b -r1.358 -r1.359
--- doc/texinfo.txi     9 Dec 2010 18:37:40 -0000       1.358
+++ doc/texinfo.txi     14 Dec 2010 17:23:59 -0000      1.359
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.358 2010/12/09 18:37:40 karl Exp $
address@hidden $Id: texinfo.txi,v 1.359 2010/12/14 17:23:59 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.
 
@@ -16749,6 +16749,20 @@
 For HTML.  Same as DOCTYPE, but for the file containing the frame
 description.
 
address@hidden PREFIX
+the output file prefix, which is prepended to some output files.  By
+default it is set by @code{@@setfilename} or from the input file
+(@pxref{setfilename}).  How this value is used depends on the value of
+other configuration variables or command line options, such as split output
+and @code{NODE_FILENAMES}.
+
address@hidden SHORT_REF
+For HTML.  If this is set, internal cross references are given without
+the sectioning word, even if the target of the reference is a section.
+
address@hidden SHORTEXTN
+The short extension, @samp{.htm} by default.
+
 @item SHOW_MENU
 @opindex --no-headers
 If set, the Texinfo menus are shown.  By default, it is only unset
@@ -16781,17 +16795,6 @@
 @item USE_SECTIONS
 Preferentially use sectioning to decide where elements are separated.
 
address@hidden SHORTEXTN
-The default extension is set to @samp{.htm}.
address@hidden PREFIX
-This set the output file prefix, that may be prepended to some output 
-files.  In the default case it is set by @code{@@setfilename} or from
-the input file (@pxref{setfilename}).  How this value is used depends
-on the value of other configuration variables or command line options,
-like split, @code{NODE_FILENAMES}.
address@hidden SHORT_REF
-For HTML.  If this is set internal cross references are given without the 
address@hidden word, even if the target of the reference is a section.
 @item IDX_SUMMARY
 If set, for each @code{@@printindex}, a file @file{<document name>_<index 
name>.idx}
 is created which contains lines of the form
@@ -18408,7 +18411,8 @@
 the corresponding Unicode code point(s) in Normalization address@hidden,
 which uses precomposed characters where available.  (This is the
 normalization form recommended by the W3C and other bodies.)  This
-holds when that code point is 0xffff or less, as it almost always is.
+holds when that code point is @code{0xffff} or less, as it almost
+always is.
 
 These will then be further transformed by the rules above into the
 string @address@hidden, where @var{xxxx} is the code point in hex.
@@ -18426,12 +18430,12 @@
 character, therefore expands to @samp{B_0306} (B with combining
 breve).
 
-When the Unicode code point is above 0xffff, the transformation is
address@hidden@var{xxxxxx}}, that is, two leading underscores followed by
+When the Unicode code point is above @code{0xffff}, the transformation
+is @address@hidden, that is, two leading underscores followed by
 six hex digits.  Since Unicode has declared that their highest code
-point is 0x10ffff, this is sufficient.  (We felt it was better to
-define this extra escape than to always use six hex digits, since the
-first two would nearly always be zeros.)
+point is @code{0x10ffff}, this is sufficient.  (We felt it was better
+to define this extra escape than to always use six hex digits, since
+the first two would nearly always be zeros.)
 
 This method works fine if the node name consists mostly of ASCII
 characters and contains only few 8-bit ones. If the document is
@@ -22997,7 +23001,7 @@
 (@url{http://www.gnu.org/software/rcs}) version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.358 2010/12/09 18:37:40 karl Exp $
+$Id: texinfo.txi,v 1.359 2010/12/14 17:23:59 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}
@@ -23076,7 +23080,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.358 2010/12/09 18:37:40 karl Exp $
address@hidden $Id: texinfo.txi,v 1.359 2010/12/14 17:23:59 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi

Index: util/htmlxref.cnf
===================================================================
RCS file: /sources/texinfo/texinfo/util/htmlxref.cnf,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- util/htmlxref.cnf   9 Dec 2010 18:37:40 -0000       1.40
+++ util/htmlxref.cnf   14 Dec 2010 17:24:05 -0000      1.41
@@ -1,6 +1,6 @@
-# htmlxref.cnf - reference file for Texinfo files on the web.
+# htmlxref.cnf - reference file for free Texinfo manuals on the web.
 
-htmlxrefversion=2010-12-09.18; # UTC
+htmlxrefversion=2010-12-13.19; # UTC
 
 # Copyright 2010 Free Software Foundation, Inc.
 # 
@@ -14,19 +14,26 @@
 # The primary goal is to list all relevant GNU manuals;
 # other free manuals are also welcome.
 #
-# Maintainers: for information on putting manuals on the web, including
-# automatically generating all the useful formats, see
-# http://www.gnu.org/prep/maintain/html_node/Manuals-on-Web-Pages.html.
+# To be included in this list, a manual must:
 #
-# All the manuals in this file should follow the naming convention for
-# nodes described at
+# - have a generic url, i.e., no version numbers;
+# - have a unique file name (identifier), i.e., be related to the
+#   package name, something like "refman" or "tutorial" doesn't work.
+# - follow the naming convention for nodes described at
 # http://www.gnu.org/software/texinfo/manual/texinfo/html_node/HTML-Xref.html
-# (otherwise cross-references fail).  This is what makeinfo and
-# texi2html implement. 
+#   This is what makeinfo and texi2html implement.
+# 
+# Unless the above criteria are met, it's not possible to generate
+# reliable cross-manual references.
 #
-# When a manual named foo is related to a package named bar, the url
-# should contain ${BAR}.  Otherwise, the gnumaint scripts have no way of
-# knowing they are associated, and thus gnu.org/manual can't include them.
+# For information on automatically generating all the useful formats for
+# a manual to put on the web, see
+# http://www.gnu.org/prep/maintain/html_node/Manuals-on-Web-Pages.html.
+
+# For people editing this file: when a manual named foo is related to a
+# package named bar, the url should contain a variable reference ${BAR}.
+# Otherwise, the gnumaint scripts have no way of knowing they are
+# associated, and thus gnu.org/manual can't include them.
 
 # shorten references to manuals on www.gnu.org.
 G = http://www.gnu.org
@@ -198,10 +205,11 @@
 gama           mono    ${GS}/gama/manual/gama.html
 gama           node    ${GS}/gama/manual/html_node/
 
-gawk           mono    ${GS}/gawk/manual/gawk.html
-gawk           node    ${GS}/gawk/manual/html_node/
- gawkinet      mono    ${GS}/gawk/manual/gawkinet/gawkinet.html
- gawkinet      node    ${GS}/gawk/manual/gawkinet/html_node/
+GAWK = ${GS}/gawk/manual
+gawk           mono    ${GAWK}/gawk.html
+gawk           node    ${GAWK}/html_node/
+ gawkinet      mono    ${GAWK}/gawkinet/gawkinet.html
+ gawkinet      node    ${GAWK}/gawkinet/html_node/
 
 gcal           mono    ${GS}/gcal/manual/gcal.html
 gcal           node    ${GS}/gcal/manual/html_node/
@@ -459,9 +467,10 @@
 sed            node    ${GS}/sed/manual/html_node/
 
 # can't use mono files since they have generic names
-smalltalk      node    ${GS}/smalltalk/manual/html_node/
-smalltalk-base node    ${GS}/smalltalk/manual-base/html_node/
-smalltalk-libs node    ${GS}/smalltalk/manual-libs/html_node/
+SMALLTALK = ${GS}/smalltalk/
+smalltalk      node    ${SMALLTALK}/manual/html_node/
+smalltalk-base node    ${SMALLTALK}/manual-base/html_node/
+smalltalk-libs node    ${SMALLTALK}/manual-libs/html_node/
 
 sourceinstall  mono    ${GS}/sourceinstall/manual/sourceinstall.html
 sourceinstall  node    ${GS}/sourceinstall/manual/html_node/
@@ -494,6 +503,9 @@
 units          mono    ${GS}/units/manual/units.html
 units          node    ${GS}/units/manual/html_node/
 
+vc-dwim                mono    ${GS}/vc-dwim/manual/vc-dwim.html
+vc-dwim                node    ${GS}/vc-dwim/manual/html_node/
+
 wdiff          mono    ${GS}/wdiff/manual/wdiff.html
 wdiff          node    ${GS}/wdiff/manual/html_node/
 
@@ -503,6 +515,9 @@
 wget           mono    ${GS}/wget/manual/wget.html
 wget           node    ${GS}/wget/manual/html_node/
 
+xboard         mono    ${GS}/xboard/manual/xboard.html
+xboard         node    ${GS}/xboard/manual/html_node/
+
 # Local Variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "htmlxrefversion="