Merge from trunk.

2 files changed, 7 insertions, 1 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2407d7dd18f..56958417300 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * basic.texi (Inserting Text): Add index entries.  (Bug#9433)
+
 2011-08-29  Chong Yidong  <cyd@stupidchicken.com>
 
         * modes.texi (Choosing Modes): auto-mode-case-fold is now t.
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index edf07859e52..b06391f004c 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -101,7 +101,9 @@ character to insert (@pxref{Arguments}).
 
 @findex ucs-insert
 @kindex C-x 8 RET
-@cindex Unicode
+@cindex Unicode characters, inserting
+@cindex insert Unicode character
+@cindex characters, inserting by name or code-point
   Instead of @kbd{C-q}, you can use @kbd{C-x 8 @key{RET}}
 (@code{ucs-insert}) to insert a character based on its Unicode name or
 code-point.  This command prompts for a character to insert, using