(General Variables): Change Numbered Backups xref to Backup Names.

[gnu-emacs] / doc / emacs / cmdargs.texi

diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 28bad72f0bf4503b248b524689b14bc4960faa82..94e69bcdfe8da8e8c4a3813cfd9ea830d86dd227 100644 (file)
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Emacs Invocation, X Resources, GNU Free Documentation License, Top
 @appendix Command Line Arguments for Emacs Invocation
@@ -277,16 +277,26 @@ option and @samp{-Q} are the only options that block it.
 Start emacs with minimum customizations.  This is like using @samp{-q}
 and @samp{--no-site-file}, but also disables the startup screen.
 
+@item -daemon
+@opindex -daemon
+@itemx --daemon
+@opindex --daemon
+Start emacs in background as a daemon (i.e. it will disconnect from the
+terminal), do not open any frames and start the server.  Clients can
+connect and create graphical or terminal frames using
+@code{emacsclient}.
+
 @item --no-splash
 @opindex --no-splash
-@vindex inhibit-splash-screen
+@vindex inhibit-startup-screen
 @cindex splash screen
 @cindex startup message
 Do not display a splash screen on startup.  You can also achieve this
-effect by setting the variable @code{inhibit-splash-screen} to
+effect by setting the variable @code{inhibit-startup-screen} to
 non-@code{nil} in you personal init file (but @emph{not} in
 @file{site-start.el}).  (This variable was called
-@code{inhibit-startup-message} in previous Emacs versions.)
+@code{inhibit-splash-screen} or @code{inhibit-startup-message} in
+previous Emacs versions.)
 
 @item --no-desktop
 @opindex --no-desktop
@@ -588,7 +598,7 @@ does not use @env{TZ} at all.
 The user's login name.  See also @env{LOGNAME}.  On MS-DOS, this
 defaults to @samp{root}.
 @item VERSION_CONTROL
-Used to initialize the @code{version-control} variable (@pxref{Numbered Backups}).
+Used to initialize the @code{version-control} variable (@pxref{Backup Names}).
 @end table
 
 @node Misc Variables
@@ -635,9 +645,6 @@ Emacs switches the DOS display to a mode where all 16 colors can be used
 for the background, so all four bits of the background color are
 actually used.
 
-@item WINDOW_GFX
-Used when initializing the Sun windows system.
-
 @item PRELOAD_WINSOCK
 On MS-Windows, if you set this variable, Emacs will load and initialize
 the network library at startup, instead of waiting until the first