Don't say "buying copies from the FSF" for manuals they do not publish

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

diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 98fffab..2c1331d 100644 (file)
--- a/doc/misc/info.texi
+++ b/doc/misc/info.texi
@@ -14,8 +14,7 @@
 This file describes how to use Info, the on-line, menu-driven GNU
 documentation system.
 
 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, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1992, 1996-2012 Free Software Foundation, Inc.

 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document


@@ -27,8 +26,7 @@ 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 the freedom to copy and
 License'' in the Emacs manual.
 
 (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.''
+modify this GNU manual.''

 
 This document is part of a collection distributed under the GNU Free
 Documentation License.  If you want to distribute this document
 
 This document is part of a collection distributed under the GNU Free
 Documentation License.  If you want to distribute this document


@@ -39,7 +37,7 @@ license to the document, as described in section 6 of the license.
 
 @dircategory Texinfo documentation system
 @direntry
 
 @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
 @end direntry
 
 @titlepage


@@ -79,7 +77,7 @@ Started' chapter.
 @end ifinfo
 @end ifnottex
 
 @end ifinfo
 @end ifnottex
 

-@insertcopying 
+@insertcopying

 
 @menu
 * Getting Started::             Getting started using an Info reader.
 
 @menu
 * Getting Started::             Getting started using an Info reader.


@@ -265,7 +263,7 @@ links.
 
 @format
 >> If you are in Emacs and have a mouse, and if you already practiced
 
 @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
 
    mouse button on the @samp{Next} link to do the same ``the mouse way''.
 @end format
 


@@ -325,7 +323,7 @@ the screen.
 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
 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
 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


@@ -1050,6 +1048,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.
 
 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
 @findex info-apropos
 @findex index-apropos
 If you aren't sure which manual documents the topic you are looking


@@ -1101,7 +1106,7 @@ In the stand-alone reader, @kbd{0} goes through the last menu item;
 this is so you need not count how many entries are there.
 
   If your display supports multiple fonts, colors or underlining, and
 this is so you need not count how many entries are there.
 
   If your display supports multiple fonts, colors or underlining, and

-you are using Emacs' Info mode to read Info files, the third, sixth
+you are using Emacs's Info mode to read Info files, the third, sixth

 and ninth menu items have a @samp{*} that stands out, either in color
 or in some other attribute, such as underline; this makes it easy to
 see at a glance which number to use for an item.
 and ninth menu items have a @samp{*} that stands out, either in color
 or in some other attribute, such as underline; this makes it easy to
 see at a glance which number to use for an item.


@@ -1135,6 +1140,12 @@ prefix argument for the @kbd{C-h i} command (@code{info}) which
 switches to the Info buffer with that number.  Thus, @kbd{C-u 2 C-h i}
 switches to the buffer @samp{*info*<2>}, creating it if necessary.
 
 switches to the Info buffer with that number.  Thus, @kbd{C-u 2 C-h i}
 switches to the buffer @samp{*info*<2>}, creating it if necessary.
 

+@findex info-display-manual
+  If you have created many Info buffers in Emacs, you might find it
+difficult to remember which buffer is showing which manual.  You can
+use the command @kbd{M-x info-display-manual} to show an Info manual
+by name, reusing an existing buffer if there is one.
+

 @node Emacs Info Variables, , Create Info buffer, Advanced
 @comment  node-name,  next,  previous,  up
 @section Emacs Info-mode Variables
 @node Emacs Info Variables, , Create Info buffer, Advanced
 @comment  node-name,  next,  previous,  up
 @section Emacs Info-mode Variables


@@ -1223,6 +1234,7 @@ this:
 
 @node Expert Info
 @chapter Info for Experts
 
 @node Expert Info
 @chapter Info for Experts

+@cindex Texinfo

 
   This chapter explains how to write an Info file by hand.  However,
 in most cases, writing a Texinfo file is better, since you can use it
 
   This chapter explains how to write an Info file by hand.  However,
 in most cases, writing a Texinfo file is better, since you can use it


@@ -1500,7 +1512,3 @@ topics discussed in this document.
 @printindex cp
 
 @bye
 @printindex cp
 
 @bye

-
-@ignore
-   arch-tag: 965c1638-01d6-4156-9227-b10418b9d8e8
-@end ignore