[5318] update info.texi from emacs 24.3

[karl]

Revision: 5318
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5318
Author:   karl
Date:     2013-08-15 17:59:54 +0000 (Thu, 15 Aug 2013)
Log Message:
-----------
update info.texi from emacs 24.3

Modified Paths:
--------------
    trunk/doc/info.texi
    trunk/util/srclist.txt

Modified: trunk/doc/info.texi
===================================================================
--- trunk/doc/info.texi 2013-08-15 17:43:21 UTC (rev 5317)
+++ trunk/doc/info.texi 2013-08-15 17:59:54 UTC (rev 5318)
@@ -14,25 +14,18 @@
 This file describes how to use Info, the on-line, menu-driven GNU
 documentation system.
 
-Copyright @copyright{} 1989, 1992, 1996-2012 Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1992, 1996--2013 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual,'' and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+and with the Back-Cover Texts as in (a) below.  A copy of the license
+is included in the section entitled ``GNU Free Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
-modify this GNU manual.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+modify this GNU manual.''
 @end quotation
 @end copying
 
@@ -78,12 +71,13 @@
 @end ifinfo
 @end ifnottex
 
address@hidden 
address@hidden
 
 @menu
 * Getting Started::             Getting started using an Info reader.
 * Advanced::                    Advanced Info commands.
 * Expert Info::                 Info commands for experts.
+* GNU Free Documentation License::  The license for this documentation.
 * Index::                       An index of topics, commands, and variables.
 @end menu
 
@@ -264,7 +258,7 @@
 
 @format
 >> If you are in Emacs and have a mouse, and if you already practiced
-   typing @kbd{n} to get to the next node, click now with the left 
+   typing @kbd{n} to get to the next node, click now with the left
    mouse button on the @samp{Next} link to do the same ``the mouse way''.
 @end format
 
@@ -324,7 +318,7 @@
 we call ``Backspace or DEL'' in this manual is labeled differently on
 different keyboards.  Look for a key which is a little ways above the
 @key{ENTER} or @key{RET} key and which you normally use outside Emacs
-to erase the character before the cursor, i.e.@: the character you
+to erase the character before the cursor, i.e., the character you
 typed last.  It might be labeled @samp{Backspace} or @samp{<-} or
 @samp{DEL}, or sometimes @samp{Delete}.} and @kbd{b} commands exist to
 allow you to ``move around'' in a node that does not all fit on the
@@ -1504,6 +1498,10 @@
 To check an Info file, do @kbd{M-x Info-validate} while looking at any
 node of the file with Emacs Info mode.
 
address@hidden GNU Free Documentation License
address@hidden GNU Free Documentation License
address@hidden fdl.texi
+
 @node Index
 @unnumbered Index
 

Modified: trunk/util/srclist.txt
===================================================================
--- trunk/util/srclist.txt      2013-08-15 17:43:21 UTC (rev 5317)
+++ trunk/util/srclist.txt      2013-08-15 17:59:54 UTC (rev 5318)
@@ -14,7 +14,10 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-$EMACSSRC/doc/misc/info.texi                   doc
+
+# Maintained in Emacs, which uses doclicense.texi instead of the usual
+# fdl.texi; seems cleaner to change it than to have two copies of the FDL.
+$EMACSSRC/doc/misc/info.texi                   doc     doclicense
 
 
 $GETTEXT/gettext-runtime/ABOUT-NLS             .
@@ -41,10 +44,12 @@
 $GNULIBSRC/doc/COPYINGv3               ./COPYING
 $GNULIBSRC/doc/INSTALL                 ./INSTALL.generic
 $GNULIBSRC/doc/fdl.texi                        doc
-#
-# Should only update at releases.  
+
+
+# Should only need to be updated after major Automake releases.
 $AUTOMAKE/tap-driver.sh                        build-aux
 $AUTOMAKE/test-driver                  build-aux
 $AUTOMAKE/missing                      build-aux
-#
+
+
 $GSASL/doc/gdoc                        contrib