Document several Emacs 24 changes.

* doc/emacs/cmdargs.texi (Initial Options): Document --no-site-lisp.
(Misc X): Document --parent-id.

* doc/emacs/frames.texi (Frame Commands): Note that focus-follows-mouse now
defaults to nil.

* doc/emacs/misc.texi (emacsclient Options): Document --parent-id.

* doc/emacs/msdog.texi (Windows HOME): Document _emacs as obsolete.

* doc/man/emacsclient.1: Document exit status.

8 files changed, 60 insertions, 19 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 79558a3ff47..aa1657462a2 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,15 @@
+2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cmdargs.texi (Initial Options): Document --no-site-lisp.
+        (Misc X): Document --parent-id.
+
+        * frames.texi (Frame Commands): Note that focus-follows-mouse now
+        defaults to nil.
+
+        * misc.texi (emacsclient Options): Document --parent-id.
+
+        * msdog.texi (Windows HOME): Document _emacs as obsolete.
+
 2011-07-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * emacs.texi: Use "..." instead of ``...'' in the menus
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index af493ade2f2..2a19e1b009d 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -289,9 +289,14 @@ like this, the Customize facility does not allow options to be saved
 @item --no-site-file
 @opindex --no-site-file
 @cindex @file{site-start.el} file, not loading
-Do not load @file{site-start.el}.  The options @samp{-q}, @samp{-u}
-and @samp{--batch} have no effect on the loading of this file---this
-option and @samp{-Q} are the only options that block it.
+Do not load @file{site-start.el} (@pxref{Init File}).  The @samp{-Q}
+option does this too, but other options like @samp{-q} do not.
+
+@item --no-site-lisp
+@opindex --no-site-lisp
+@cindex @file{site-start.el} file, not loading
+Do not include the @file{site-lisp} directories in @code{load-path}
+(@pxref{Init File}).  The @samp{-Q} option does this too.
 
 @item --no-splash
 @opindex --no-splash
@@ -307,9 +312,9 @@ in your initialization file (@pxref{Entering Emacs}).
 @itemx --quick
 @opindex --quick
 Start emacs with minimum customizations, similar to using @samp{-q},
-@samp{--no-site-file}, and @samp{--no-splash} together.  This also
-stops Emacs from processing X resources by setting
-@code{inhibit-x-resources} to @code{t} (@pxref{Resources}).
+@samp{--no-site-file}, @samp{--no-site-lisp}, and @samp{--no-splash}
+together.  This also stops Emacs from processing X resources by
+setting @code{inhibit-x-resources} to @code{t} (@pxref{Resources}).
 
 @item -daemon
 @opindex -daemon
@@ -1131,6 +1136,11 @@ use---usually just a small rectangle containing the frame's title.
 @c Enable horizontal scroll bars.  Since horizontal scroll bars
 @c are not yet implemented, this actually does nothing.
 
+@item --parent-id @var{ID}
+Open Emacs as a client X window via the XEmbed protocol, with @var{ID}
+as the parent X window id.  Currently, this option is mainly useful
+for developers.
+
 @item -vb
 @opindex -vb
 @itemx --vertical-scroll-bars
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 5f708895d07..b9b56670988 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -460,15 +460,15 @@ this case, @kbd{C-x 5 0} can delete the last interactive frame; you
 can use @command{emacsclient} to reconnect to the Emacs session.
 
 @vindex focus-follows-mouse
-  On X, you may have to tell Emacs how the system (or the window
-manager) handles focus-switching between windows, in order for the
-command @kbd{C-x 5 o} (@code{other-frame}) to work properly.
-Unfortunately, there is no way for Emacs to detect this automatically,
-so you should set the variable @code{focus-follows-mouse}.  If simply
-moving the mouse onto a window selects it and gives it focus, the
-variable should be @code{t}; if you have to click on the window to
-select it, the variable should be @code{nil}.  The default is
-@code{t}.
+  On X, you may have to tell Emacs how the window manager handles
+focus-switching between windows, in order for @kbd{C-x 5 o}
+(@code{other-frame}) to work properly.  Unfortunately, there is no way
+for Emacs to detect this automatically, so you should set the variable
+@code{focus-follows-mouse}.  The default is @code{nil}, meaning you
+have to click on the window to select it (the default for most modern
+window managers).  You should change it to @code{t} if your window
+manager selects and window and gives it focus anytime you move the
+mouse onto the window.
 
   The window manager that is part of MS-Windows always gives focus to
 a frame that raises, so this variable has no effect in the native
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index b7b634af8b1..73c742c493a 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1678,6 +1678,11 @@ all server buffers are finished.  You can take as long as you like to
 edit the server buffers within Emacs, and they are @emph{not} killed
 when you type @kbd{C-x #} in them.
 
+@item --parent-id @var{ID}
+Open an @command{emacsclient} frame as a client frame in the parent X
+window with id @var{ID}, via the XEmbed protocol.  Currently, this
+option is mainly useful for developers.
+
 @item -q
 @itemx --quiet
 Do not let @command{emacsclient} display messages about waiting for
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index 56fe20f0794..533872ddf61 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -445,10 +445,10 @@ any name mentioned in @ref{Init File}.
 
 @cindex @file{_emacs} init file, MS-Windows
   Because MS-DOS does not allow file names with leading dots, and
-because older Windows systems made it hard to create files with such
-names, the Windows port of Emacs supports an alternative name
-@file{_emacs} as a fallback, if such a file exists in the home
-directory, whereas @file{.emacs} does not.
+older Windows systems made it hard to create files with such names,
+the Windows port of Emacs supports an init file name @file{_emacs}, if
+such a file exists in the home directory and @file{.emacs} does not.
+This name is considered obsolete.
 
 @node Windows Keyboard
 @section Keyboard Usage on MS-Windows
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 88f70e410c8..0735e0593f9 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacsclient.1: Document exit status.
+
 2011-06-25  Andreas Rottmann  <a.rottmann@gmx.at>
 
         * emacsclient.1: Mention --frame-parameters.
diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1
index 4843053666a..4020b6c0b6a 100644
--- a/doc/man/emacsclient.1
+++ b/doc/man/emacsclient.1
@@ -87,6 +87,9 @@ print version information and exit
 .TP
 .B \-H, \-\-help
 print this usage information message and exit
+.SH "EXIT STATUS"
+Normally, the exit status is 0.  If emacsclient shuts down due to
+Emacs signaling an error, the exit status is 1.
 .SH "SEE ALSO"
 The program is documented fully in
 .IR "Using Emacs as a Server"
diff --git a/etc/NEWS b/etc/NEWS
index ab9900883c8..c34c0467dd9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -58,13 +58,16 @@ automatically select it.
 
 * Startup Changes in Emacs 24.1
 
+---
 ** The --unibyte, --multibyte, --no-multibyte, and --no-unibyte
 command line arguments, and the EMACS_UNIBYTE environment variable, no
 longer have any effect.  (They were declared obsolete in Emacs 23.)
 
++++
 ** New command line option `--no-site-lisp' removes site-lisp directories
 from load-path.  -Q now implies this.
 
+---
 ** On Windows, Emacs now warns when the obsolete _emacs init file is used,
 and also when HOME is set to C:\ by default.
 
@@ -77,6 +80,7 @@ pops up *Messages*" feature, which can now easily be changed.
 
 ** emacsclient changes
 
++++
 *** New emacsclient argument --parent-id ID can be used to open a
 client frame in parent X window ID, via XEmbed.  This works like the
 --parent-id argument to Emacs.
@@ -88,10 +92,12 @@ client frame in parent X window ID, via XEmbed.  This works like the
 *** New emacsclient argument --frame-parameters can be used to set the
 frame parameters of a newly-created graphical frame.
 
++++
 *** If emacsclient shuts down as a result of Emacs signalling an
 error, its exit status is 1.
 
 ** Completion
+
 *** shell-mode uses pcomplete rules, with the standard completion UI.
 
 *** Many packages have been changed to use completion-at-point rather than
@@ -353,6 +359,7 @@ replaced with Lisp commands `doc-file-to-man' and `doc-file-to-info'.
 ** The standalone program `fakemail' has been removed.
 If you need it, feedmail.el ought to provide a superset of the functionality.
 
++++
 ** The variable `focus-follows-mouse' now always defaults to nil.
 
 ** New primitive `secure-hash' that supports many secure hash algorithms