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

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/11/19 00:51:39

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

Log message:
        (GNU Sample Texts): update and make self-consistent

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1183&r2=1.1184
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.354&r2=1.355
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/htmlxref.cnf?cvsroot=texinfo&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1183
retrieving revision 1.1184
diff -u -b -r1.1183 -r1.1184
--- ChangeLog   17 Nov 2010 19:51:58 -0000      1.1183
+++ ChangeLog   19 Nov 2010 00:51:38 -0000      1.1184
@@ -1,3 +1,7 @@
+2010-11-18  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (GNU Sample Texts): update and make self-consistent.
+
 2010-11-17  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi: uniqify more index entries.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -b -r1.354 -r1.355
--- doc/texinfo.txi     17 Nov 2010 19:51:58 -0000      1.354
+++ doc/texinfo.txi     19 Nov 2010 00:51:39 -0000      1.355
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.354 2010/11/17 19:51:58 karl Exp $
address@hidden $Id: texinfo.txi,v 1.355 2010/11/19 00:51:39 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.
 
@@ -39,9 +39,8 @@
 a documentation system that can produce both online information and a
 printed manual from a single source.
 
-Copyright @copyright{} 1988, 1990, 1991, 1992, 1993, 1995, 1996, 1997,
-1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-2009, 2010 Free Software Foundation, Inc.
+Copyright @copyright{} 1988, 1990--1993, 1995--2010 Free Software
+Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -3158,8 +3157,8 @@
 emit the copying information.  See the next section for details.
 
 @findex copyright
-The @code{@@address@hidden@}} command generates a @samp{c} inside a circle
-in output formats that support this (print and HTML).  In the other
+The @code{@@address@hidden@}} command generates a @samp{c} inside a
+circle in output formats that support this (print and HTML).  In other
 formats (Info and plain text), it generates @samp{(C)}.  The copyright
 notice itself has the following legally defined sequence:
 
@@ -3191,7 +3190,7 @@
 publication.  If you do use several lines, do not indent any of them
 (or anything else in the @code{@@copying} block) in the source file.
 
address@hidden Notices,,,maintain,GNU Maintenance Instructions}, for
address@hidden Notices,,,maintain,GNU Maintainer Information}, for
 additional information.
 
 
@@ -22857,7 +22856,7 @@
 @@copying
 This is a short example of a complete Texinfo file.
 
-Copyright @@address@hidden@} 2009 Free Software Foundation, Inc.
+Copyright @@address@hidden@} 2010 Free Software Foundation, Inc.
 @@end copying
 
 @@titlepage
@@ -22947,7 +22946,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.354 2010/11/17 19:51:58 karl Exp $
+$Id: texinfo.txi,v 1.355 2010/11/19 00:51:39 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}
@@ -23026,7 +23025,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.354 2010/11/17 19:51:58 karl Exp $
address@hidden $Id: texinfo.txi,v 1.355 2010/11/19 00:51:39 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi
@@ -23037,7 +23036,7 @@
 This manual is for GNU Sample (version @value{VERSION}, @value{UPDATED}),
 which is an example in the Texinfo documentation.
 
-Copyright @copyright{} 2009 Free Software Foundation, Inc.
+Copyright @copyright{} 2010 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -23079,7 +23078,7 @@
 
 @menu
 * Invoking sample::
-* Copying This Manual::
+* GNU Free Documentation License::
 * Index::
 @end menu
 
@@ -23091,7 +23090,7 @@
 @cindex invoking @command{sample}
 
 This is a sample manual.  There is no sample program to
-invoke, but if there was, you could see its basic usage
+invoke, but if there were, you could see its basic usage
 and command line options here.
 
 

Index: util/htmlxref.cnf
===================================================================
RCS file: /sources/texinfo/texinfo/util/htmlxref.cnf,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- util/htmlxref.cnf   17 Nov 2010 19:51:58 -0000      1.36
+++ util/htmlxref.cnf   19 Nov 2010 00:51:39 -0000      1.37
@@ -1,6 +1,6 @@
 # htmlxref.cnf - reference file for Texinfo files on the web.
 
-htmlxrefversion=2010-11-16.19; # UTC
+htmlxrefversion=2010-11-18.18; # UTC
 
 # Copyright 2010 Free Software Foundation, Inc.
 # 
@@ -227,6 +227,8 @@
 
 gnu-arch       node    ${GS}/gnu-arch/tutorial/
 
+gnu-c-manual   mono    ${GS}/gnu-c-manual/gnu-c-manual.html
+
 gnu-crypto     node    ${GS}/gnu-crypto/manual/
 
 gnubg          mono    ${GS}/gnubg/manual/gnubg.html