texinfo ChangeLog doc/texinfo.txi

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/03/17 18:39:26

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 

Log message:
        import "free software" description from emacs manual

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1033&r2=1.1034
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.250&r2=1.251

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1033
retrieving revision 1.1034
diff -u -b -r1.1033 -r1.1034
--- ChangeLog   17 Mar 2010 18:35:54 -0000      1.1033
+++ ChangeLog   17 Mar 2010 18:39:26 -0000      1.1034
@@ -1,5 +1,8 @@
 2010-03-17  Karl Berry  <address@hidden>
 
+       * doc/texinfo.txi (Copying Conditions): import better "free software"
+       description from the Emacs manual.
+
        * doc/texinfo.txi (Info Format Specification): new appendix,
        written by Patrice Dumas and me.
 

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -b -r1.250 -r1.251
--- doc/texinfo.txi     17 Mar 2010 18:35:56 -0000      1.250
+++ doc/texinfo.txi     17 Mar 2010 18:39:26 -0000      1.251
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.250 2010/03/17 18:35:56 karl Exp $
address@hidden $Id: texinfo.txi,v 1.251 2010/03/17 18:39:26 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.
 
@@ -713,16 +713,16 @@
 @unnumbered Texinfo Copying Conditions
 @cindex Copying conditions
 @cindex Conditions for copying Texinfo
address@hidden Free software
address@hidden Libre software
 
-The programs currently being distributed that relate to Texinfo include
address@hidden, @code{info}, @code{texindex}, and @file{texinfo.tex}.
-These programs are @dfn{free}; this means that everyone is free to use
-them and free to redistribute them on a free basis.  The Texinfo-related
-programs are not in the public domain; they are copyrighted and there
-are restrictions on their distribution, but these restrictions are
-designed to permit everything that a good cooperating citizen would want
-to do.  What is not allowed is to try to prevent others from further
-sharing any version of these programs that they might get from you.
+GNU Texinfo is @dfn{free software}; this means that everyone is free
+to use it and free to redistribute it on certain conditions.  Texinfo
+is not in the public domain; it is copyrighted and there are
+restrictions on its distribution, but these restrictions are designed
+to permit everything that a good cooperating citizen would want to do.
+What is not allowed is to try to prevent others from further sharing
+any version of Texinfo that they might get from you.
 
 Specifically, we want to make sure that you have the right to give away
 copies of the programs that relate to Texinfo, that you receive source
@@ -19625,7 +19625,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.250 2010/03/17 18:35:56 karl Exp $
+$Id: texinfo.txi,v 1.251 2010/03/17 18:39:26 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}
@@ -19704,7 +19704,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.250 2010/03/17 18:35:56 karl Exp $
address@hidden $Id: texinfo.txi,v 1.251 2010/03/17 18:39:26 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi