Merge from trunkpending

1 files changed, 9 insertions, 3 deletions

diff --git a/doc/misc/info.texi b/doc/misc/info.texi
index 68390a2f0cc..8952bfb9122 100644
--- 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.
 
-Copyright @copyright{} 1989, 1992, 1996-2011
-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
@@ -1108,7 +1107,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
-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.
@@ -1142,6 +1141,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.
 
+@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
@@ -1230,6 +1235,7 @@ this:
 
 @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