merge from trunk

2 files changed, 11 insertions, 5 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index ed073456e7e..b37fa4e64f3 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,6 +1,11 @@
+2013-09-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * text.texi (Not Intervals): Minor wording fix.
+
 2013-09-12  Xue Fuqiao  <xfq.free@gmail.com>
 
-        * functions.texi (Obsolete Functions): Add an index for obsolete functions.
+        * functions.texi (Obsolete Functions): Add an index for obsolete
+        functions.
 
 2013-09-11  Xue Fuqiao  <xfq.free@gmail.com>
 
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index c4250f2f0ba..aa19338ddaf 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -3920,10 +3920,11 @@ between one interval and two.
   Insertion of text at the border between intervals also raises
 questions that have no satisfactory answer.
 
-  However, it is easy to arrange for editing to behave consistently for
-questions of the form, ``What are the properties of this character?''
-So we have decided these are the only questions that make sense; we have
-not implemented asking questions about where intervals start or end.
+  However, it is easy to arrange for editing to behave consistently
+for questions of the form, ``What are the properties of text at this
+buffer or string position?''  So we have decided these are the only
+questions that make sense; we have not implemented asking questions
+about where intervals start or end.
 
   In practice, you can usually use the text property search functions in
 place of explicit interval boundaries.  You can think of them as finding