From a5656eae9df0402207eed16d7b1e4848ebd00b24 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Tue, 20 Mar 2012 00:44:03 -0700
Subject: [PATCH] os.texi "Startup Summary" small changes

* doc/lispref/os.texi (Startup Summary):
Don't mention initial-buffer-choice = t.
Add summary table of some relevant command-line options.
---
 doc/lispref/ChangeLog |  5 +++++
 doc/lispref/os.texi   | 43 +++++++++++++++++++++++++++++++++++++++----
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index af0cb30624..d8e96914d5 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-20  Glenn Morris  <rgm@gnu.org>
+
+	* os.texi (Startup Summary): Don't mention initial-buffer-choice = t.
+	Add summary table of some relevant command-line options.
+
 2012-03-18  Chong Yidong  <cyd@gnu.org>
 
 	* internals.texi (Building Emacs, Garbage Collection): Copyedits.
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 1021787a0f..2563bc57ae 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -248,6 +248,9 @@ previous session.  @xref{Session Management}.
 
 @end enumerate
 
+@noindent
+The following options affect some aspects of the startup sequence.
+
 @defopt inhibit-startup-screen
 This variable, if non-@code{nil}, inhibits the startup screen.  In
 that case, Emacs typically displays the @samp{*scratch*} buffer; but
@@ -265,9 +268,13 @@ aliases for this variable.
 
 @defopt initial-buffer-choice
 This variable, if non-@code{nil}, determines a file or buffer for
-Emacs to display after starting up, instead of the startup screen.  If
-its value is @code{t}, Emacs displays the @samp{*scratch*} buffer.  If
-its value is a string, that specifies the name of a file for Emacs to
+Emacs to display after starting up, instead of the startup screen.
+@ignore
+@c I do not think this should be mentioned.  AFAICS it is just a dodge
+@c around inhibit-startup-screen not being settable on a site-wide basis.
+If its value is @code{t}, Emacs displays the @samp{*scratch*} buffer. 
+@end ignore
+If its value is a string, that specifies the name of a file for Emacs to
 visit.
 @end defopt
 
@@ -283,7 +290,7 @@ form to your init file:
 
 Emacs explicitly checks for an expression as shown above in your init
 file; your login name must appear in the expression as a Lisp string
-constant.  Other methods of setting
+constant.  You can also use the Custom interface.  Other methods of setting
 @code{inhibit-startup-echo-area-message} to the same value do not
 inhibit the startup message.  This way, you can easily inhibit the
 message for yourself if you wish, but thoughtless copying of your init
@@ -296,6 +303,34 @@ inserted into the @samp{*scratch*} buffer when Emacs starts up.  If it
 is @code{nil}, the @samp{*scratch*} buffer is empty.
 @end defopt
 
+@noindent
+The following command-line options affect some aspects of the startup
+sequence.  @xref{Initial Options,,, emacs, The GNU Emacs Manual}.
+
+@table @code
+@item --no-splash
+Do not display a splash screen.
+
+@item --batch
+Run without an interactive terminal.  @xref{Batch Mode}.
+
+@item --daemon
+Do not initialize any display; just start a server in the background.
+
+@item --no-init-file
+@itemx -Q
+Do not load either the init file, or the @file{default} library.
+
+@item --no-site-file
+Do not load the @file{site-start} library.
+
+@item --quick
+@itemx -Q
+Equivalent to @samp{-q --no-site-file --no-splash}.
+@c and --no-site-lisp, but let's not mention that here.
+@end table
+
+
 @node Init File
 @subsection The Init File
 @cindex init file
-- 
2.20.1