merge from trunk

2 files changed, 3 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index fcb47b30f9a..41c31244668 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,6 +1,7 @@
 2013-08-16  Xue Fuqiao  <xfq.free@gmail.com>
 
         * text.texi (Insertion): Refine.
+        (Margins): Add an index.
 
         * positions.texi (Character Motion):
         * markers.texi (Moving Markers):
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 17a1798be2f..a1b78b213b1 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -484,6 +484,7 @@ it except to install it on a keymap.
 
 In an interactive call, @var{count} is the numeric prefix argument.
 
+@c FIXME: This variable is obsolete since 23.1.
 Self-insertion translates the input character through
 @code{translation-table-for-input}.  @xref{Translation of Characters}.
 
@@ -1613,6 +1614,7 @@ newlines'' act as paragraph separators.
 
 @node Margins
 @section Margins for Filling
+@cindex margins, filling
 
 @defopt fill-prefix
 This buffer-local variable, if non-@code{nil}, specifies a string of