Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.

[bpt/emacs.git] / doc / misc / info.texi

diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 333e331..68390a2 100644 (file)
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -14,22 +14,21 @@
 This file describes how to use Info, the on-line, menu-driven GNU
 documentation system.
 
-Copyright @copyright{} 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1992, 1996-2011
+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.2 or
+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.
 
-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and
-modify this GNU Manual, like GNU software.  Buying copies from GNU
-Press supports the FSF in developing GNU and promoting software
-freedom.''
+(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
@@ -40,7 +39,7 @@ license to the document, as described in section 6 of the license.
 
 @dircategory Texinfo documentation system
 @direntry
-* Info: (info).         How to use the documentation browsing system.
+* Info: (info).                 How to use the documentation browsing system.
 @end direntry
 
 @titlepage
@@ -64,9 +63,10 @@ The GNU Project distributes most of its on-line manuals in the
 probably using an Info reader to read this now.
 
 There are two primary Info readers: @code{info}, a stand-alone program
-designed just to read Info files, and the @code{info} package in GNU
-Emacs, a general-purpose editor.  At present, only the Emacs reader
-supports using a mouse.
+designed just to read Info files (@pxref{Top,,What is Info?,
+info-stnd, GNU Info}), and the @code{info} package in GNU Emacs, a
+general-purpose editor.  At present, only the Emacs reader supports
+using a mouse.
 
 @ifinfo
 If you are new to the Info reader and want to learn how to use it,
@@ -79,6 +79,8 @@ Started' chapter.
 @end ifinfo
 @end ifnottex
 
+@insertcopying 
+
 @menu
 * Getting Started::             Getting started using an Info reader.
 * Advanced::                    Advanced Info commands.
@@ -970,7 +972,7 @@ an actual @samp{?} character, the simplest way is to insert it using
 
 @node Search Text, Search Index,  , Advanced
 @comment  node-name,  next,  previous,  up
-@section How to search Info documents
+@section @kbd{s} searches Info documents
 
 @cindex searching Info documents
 @cindex Info document as a reference
@@ -1000,12 +1002,6 @@ reached, if the header is not visible (this can happen, because @kbd{s}
 puts your cursor at the occurrence of the string, not at the beginning
 of the node).
 
-@kindex M-s @r{(Info mode)}
-  In Emacs, @kbd{Meta-s} is equivalent to @kbd{s}.  That is for
-compatibility with other GNU packages that use @kbd{M-s} for a similar
-kind of search command.  Both @kbd{s} and @kbd{M-s} run in Emacs the
-command @code{Info-search}.
-
 @kindex C-s @r{(Info mode)}
 @kindex C-r @r{(Info mode)}
 @findex isearch
@@ -1018,7 +1014,7 @@ by setting the variable @code{Info-isearch-search} to @code{nil}
 
 @node Search Index, Go to node, Search Text, Advanced
 @comment  node-name,  next,  previous,  up
-@section How to search the indices for specific subjects
+@section @kbd{i} searches the indices for specific subjects
 
 @cindex searching Info indices
 @kindex i @r{(Info mode)}
@@ -1054,6 +1050,13 @@ their names when @kbd{i} prompts you for a topic.  For example, if you
 want to read the description of what the @kbd{C-l} key does, type
 @kbd{iC-l@key{RET}} literally.
 
+@findex Info-virtual-index
+@kindex I @r{(Info mode)}
+Emacs provides the command @code{Info-virtual-index}, bound to the
+@kbd{I} key.  This behaves like @kbd{i}, but constructs a virtual
+info node displaying the results of an index search, making it easier
+to select the one you want.
+
 @findex info-apropos
 @findex index-apropos
 If you aren't sure which manual documents the topic you are looking
@@ -1504,7 +1507,3 @@ topics discussed in this document.
 @printindex cp
 
 @bye
-
-@ignore
-   arch-tag: 965c1638-01d6-4156-9227-b10418b9d8e8
-@end ignore