merge from trunk

3 files changed, 6 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 995203b5109..3f9d23a5476 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-18  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * positions.texi (Positions): Improve indexing.
+
 2013-08-18  Eli Zaretskii  <eliz@gnu.org>
 
         * markers.texi (The Region): Improve indexing.
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index d514cff1a16..69f1b80c431 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -5,6 +5,7 @@
 @node Positions
 @chapter Positions
 @cindex position (in buffer)
+@cindex buffer position
 
   A @dfn{position} is the index of a character in the text of a buffer.
 More precisely, a position identifies the place between two characters
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 385b0f95c44..c4250f2f0ba 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -4028,6 +4028,7 @@ A rectangle is represented by a list of strings.
 This represents a window configuration to restore in one frame, and a
 position to jump to in the current buffer.
 
+@c FIXME: Mention frameset here.
 @item @code{(@var{frame-configuration} @var{position})}
 This represents a frame configuration to restore, and a position
 to jump to in the current buffer.