Merge from mainline.

4 files changed, 16 insertions, 5 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 74787c3de3b..13f99b466a3 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * srecode/el.srt: Fix typo.
+
 2011-02-21  Chong Yidong  <cyd@stupidchicken.com>
 
         * themes/tango-dark-theme.el: Tweak background on low-color
@@ -117,7 +121,7 @@
 
         * NEWS: Mention new Tramp method "ksu".
 
-2010-12-13  W. Martin Borgert <debacle@debian.org>  (tiny change)
+2010-12-13  W. Martin Borgert  <debacle@debian.org>  (tiny change)
 
         * schema/schemas.xml: Add DocBook (Bug#7491).
 
diff --git a/etc/NEWS b/etc/NEWS
index 7be8d4fb34b..df9884e94b1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -71,6 +71,9 @@ from load-path.  -Q now implies this.
 client frame in parent X window ID, via XEmbed.  This works like the
 --parent-id argument to Emacs.
 
++++
+*** New emacsclient argument -q/--quiet suppresses some status messages.
+
 *** If emacsclient shuts down as a result of Emacs signalling an
 error, its exit status is 1.
 
@@ -176,6 +179,8 @@ higher-resolution time stamps.
 and SIGHUP, and upon SIGINT in batch mode.
 
 ** kill-emacs-hook is now also run in batch mode.
+If you have code that adds something to kill-emacs-hook, you should
+consider if it is still appropriate to add it in the noninteractive case.
 
 ** New scrolling commands `scroll-up-command' and `scroll-down-command'
 (bound to C-v/[next] and M-v/[prior]) does not signal errors at top/bottom
@@ -651,6 +656,8 @@ Notifications API.  It requires D-Bus for communication.
 ** soap-client.el supports access to SOAP web services from Emacs.
 soap-inspect.el is an interactive inspector for SOAP WSDL structures.
 
+** xmodmap-generic-mode for xmodmap files.
+
 
 * Incompatible Lisp Changes in Emacs 24.1
 
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 181548e98d6..3e7a364ffd0 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -129,7 +129,7 @@ starting from the first line of text below the header line.
 
 * Changes in Emacs 23.3 on non-free operating systems
 
-** The nextstep port can have different modifiers for the left and right
+** The NeXTstep port can have different modifiers for the left and right
 alt/option key by customizing the value for ns-right-alternate-modifier.
 
 
@@ -697,7 +697,7 @@ a GIF library.
 
 *** Emacs now supports multi-page TIFF images.
 
-** New NeXTSTEP-based port.
+** New NeXTstep-based port.
 This provides support for GNUstep (via the GNUstep libraries) and Mac
 OS X (via the Cocoa libraries).
 
@@ -707,7 +707,7 @@ other emacsen (e.g. X11 build) use --disable-ns-self-contained.  See
 nextstep/README and nextstep/INSTALL in the Emacs source directory.
 
 ** Mac OS X is no longer supported via Carbon.
-Use the NeXTSTEP port, described above.
+Use the NeXTstep port, described above.
 
 ** The new configuration option "--with-dbus" enables D-Bus language
 bindings for Emacs.
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt
index b63d560582c..6117e72be2a 100644
--- a/etc/srecode/el.srt
+++ b/etc/srecode/el.srt
@@ -261,7 +261,7 @@ template defgroup :indent :blank
 ----
 (defgroup $?MODESYM$-mode nil
   "$MODESYM$ group."
-  :group 'langauges)
+  :group 'languages)
 ----
 bind "g"