Merge from emacs-24 branch; up to 2012-05-01T18:47:23Z!rgm@gnu.org

2 files changed, 11 insertions, 6 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 58bce13ba9d..d2312db1801 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * faq.texi (Right-to-left alphabets): Update for Emacs 24.
+        (Bug#12073)
+
 2012-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Prefer typical American spelling for "acknowledgment".
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 9bb3feb52e1..2983667c5cd 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -4044,13 +4044,13 @@ Emacs Manual}.  For more sophisticated methods,
 @cindex Right-to-left alphabets
 @cindex Hebrew, handling with Emacs
 @cindex Semitic alphabets
-@cindex Arabic alphabets
-@cindex Bidirectional text
+@cindex Arabic
+@cindex Farsi
+@cindex bidirectional scripts
 
-Emacs supports Hebrew characters (ISO 8859-8) since version 20, but does
-not yet support right-to-left character entry and display.  The
-@uref{http://lists.gnu.org/mailman/listinfo/emacs-bidi, emacs-bidi
-mailing list} discusses development of support for this feature.
+Emacs supports display and editing of bidirectional scripts, such as
+Arabic, Farsi, and Hebrew, since version 24.1.
+@xref{New in Emacs 24, bidirectional display}.
 
 
 @node How to add fonts