[Emacs-diffs] /srv/bzr/emacs/trunk r107631: os.texi "Startup Summary" small changes

[Glenn Morris]

------------------------------------------------------------
revno: 107631
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-03-20 00:44:03 -0700
message:
  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.
modified:
  doc/lispref/ChangeLog
  doc/lispref/os.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-03-18 15:02:12 +0000
+++ b/doc/lispref/ChangeLog     2012-03-20 07:44:03 +0000
@@ -1,3 +1,8 @@
+2012-03-20  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * internals.texi (Building Emacs, Garbage Collection): Copyedits.

=== modified file 'doc/lispref/os.texi'
--- a/doc/lispref/os.texi       2012-03-18 15:02:12 +0000
+++ b/doc/lispref/os.texi       2012-03-20 07:44:03 +0000
@@ -248,6 +248,9 @@
 
 @end enumerate
 
address@hidden
+The following options affect some aspects of the startup sequence.
+
 @defopt inhibit-startup-screen
 This variable, if address@hidden, inhibits the startup screen.  In
 that case, Emacs typically displays the @samp{*scratch*} buffer; but
@@ -265,9 +268,13 @@
 
 @defopt initial-buffer-choice
 This variable, if address@hidden, 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.
address@hidden
address@hidden I do not think this should be mentioned.  AFAICS it is just a 
dodge
address@hidden around inhibit-startup-screen not being settable on a site-wide 
basis.
+If its value is @code{t}, Emacs displays the @samp{*scratch*} buffer. 
address@hidden ignore
+If its value is a string, that specifies the name of a file for Emacs to
 visit.
 @end defopt
 
@@ -283,7 +290,7 @@
 
 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 @@
 is @code{nil}, the @samp{*scratch*} buffer is empty.
 @end defopt
 
address@hidden
+The following command-line options affect some aspects of the startup
+sequence.  @xref{Initial Options,,, emacs, The GNU Emacs Manual}.
+
address@hidden @code
address@hidden --no-splash
+Do not display a splash screen.
+
address@hidden --batch
+Run without an interactive terminal.  @xref{Batch Mode}.
+
address@hidden --daemon
+Do not initialize any display; just start a server in the background.
+
address@hidden --no-init-file
address@hidden -Q
+Do not load either the init file, or the @file{default} library.
+
address@hidden --no-site-file
+Do not load the @file{site-start} library.
+
address@hidden --quick
address@hidden -Q
+Equivalent to @samp{-q --no-site-file --no-splash}.
address@hidden and --no-site-lisp, but let's not mention that here.
address@hidden table
+
+
 @node Init File
 @subsection The Init File
 @cindex init file