Merge from trunk.

2 files changed, 6 insertions, 1 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index d59bbf87bce..f08ee3a227c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * display.texi (Bidirectional Display): Document the fact that
+        bidi-display-reordering is t by default.
+
 2011-07-23  Eli Zaretskii  <eliz@gnu.org>
 
         * display.texi (Bidirectional Display): New section.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 903232bcbda..077d0992232 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -6007,7 +6007,7 @@ a ``Full bidirectionality'' class implementation of the @acronym{UBA}.
 whether text in the buffer is reordered for display.  If its value is
 non-@code{nil}, Emacs reorders characters that have right-to-left
 directionality when they are displayed.  The default value is
-@code{nil}.  Text in overlay strings (@pxref{Overlay
+@code{t}.  Text in overlay strings (@pxref{Overlay
 Properties,,before-string}), display strings (@pxref{Overlay
 Properties,,display}), and @code{display} text properties
 (@pxref{Display Property}) is also reordered if the buffer whose text