(Backquote): Minor clarification.

4 files changed, 15 insertions, 5 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 96dd4c39eb4..884fd4995a5 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -60,6 +60,10 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00690.html
 "can't turn off font-lock"
 http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00548.html
 
+** mah@everybody.org, Sep 18: erc causes emacs to hang with multi-tty
+
+** jbw@macs.hw.ac.uk, Sep 18: before-string property has no effect if display property is empty
+
 * DOCUMENTATION
 
 ** Check the Emacs Tutorial.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 490ef3623a5..9e16ae4500c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-23  Richard Stallman  <rms@gnu.org>
+
+        * macros.texi (Backquote): Minor clarification.
+
 2007-09-06  Glenn Morris  <rgm@gnu.org>
 
         * Move from lispref/ to doc/lispref/.  Change all setfilename
diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi
index c8646f77cce..152b7b652b6 100644
--- a/doc/lispref/macros.texi
+++ b/doc/lispref/macros.texi
@@ -365,7 +365,7 @@ whitespace between the @samp{`}, @samp{,} or @samp{,@@} and the
 following expression.
 
 This syntax is still accepted, for compatibility with old Emacs
-versions, but support for it will soon disappear.
+versions, but support for it will be removed in the future.
 
 @node Problems with Macros
 @section Common Problems Using Macros
diff --git a/etc/NEWS b/etc/NEWS
index 91a85280076..e7b9f6bd0d2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -38,6 +38,12 @@ a GIF library.
 
 * Changes in Emacs 23.1
 
+** Emacs now supports using both X displays and ttys in one session.
+You can also use any number of different ttys.
+
+You can test for the presence of this feature in your Lisp code by
+testing for the `multi-tty' feature.
+
 ** Emacs comes with a new set of icons for Mac OS X.
 OS-X-style icons (an application icon and a relevant document icon)
 were contributed by Kentaro Ohkouchi.
@@ -53,10 +59,6 @@ symbolic notation thanks to auxiliary functions.
 ** split-window-preferred-function specifies whether display-buffer should
 split windows vertically or horizontally.
 
-** Support for multiple terminal devices and simultaneous graphical
-and tty frames has been added.  You can test for the presence of this
-feature in your Lisp code by testing for the `multi-tty' feature.
-
 ** Emacsclient has been extended to support opening a new terminal
 frame.  Its behavior has been changed to open a new Emacs frame by
 default.  Use the -c option to get the old behavior of opening files in