texinfo update (Sat Mar 25 14:22:01 EST 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -r1.581 -r1.582
--- ChangeLog   25 Mar 2006 00:14:53 -0000      1.581
+++ ChangeLog   25 Mar 2006 19:20:49 -0000      1.582
@@ -1,3 +1,8 @@
+2006-03-25  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (copying): warn not to indent lines within the
+       @copying.
+
 2006-03-24  Karl Berry  <address@hidden>
 
        * makeinfo/html.c (escape_string): do not free the old string,
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- doc/texinfo.txi     14 Mar 2006 23:44:10 -0000      1.157
+++ doc/texinfo.txi     25 Mar 2006 19:20:49 -0000      1.158
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.157 2006/03/14 23:44:10 karl Exp $
address@hidden $Id: texinfo.txi,v 1.158 2006/03/25 19:20:49 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.
 
@@ -3099,10 +3099,11 @@
 work.  In the case of works assigned to the FSF, the owner is `Free
 Software Foundation, Inc.'.
 
-The copyright `line' may actually be split across multiple
-lines, both in the source document and in the output.  This often
-happens for documents with a long history, having many different years
-of publication.
+The copyright `line' may actually be split across multiple lines, both
+in the source document and in the output.  This often happens for
+documents with a long history, having many different years of
+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.
 
 @xref{Copyright Notices,,,maintain,GNU Maintenance Instructions}, for
 additional information.
@@ -18606,7 +18607,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.157 2006/03/14 23:44:10 karl Exp $
+$Id: texinfo.txi,v 1.158 2006/03/25 19:20:49 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}
@@ -18672,7 +18673,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.157 2006/03/14 23:44:10 karl Exp $
address@hidden $Id: texinfo.txi,v 1.158 2006/03/25 19:20:49 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi
P ChangeLog
P doc/texinfo.txi