2 files changed, 13 insertions, 0 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index bae3e02d302..c3b98fc55de 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-21  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * cmdargs.texi (Initial Options): Document --daemon.
+
 2008-09-20  Glenn Morris  <rgm@gnu.org>
 
         * files.texi (Numbered Backups): Mention that some modes set
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 74ebe3c9e1f..1e733755e99 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -277,6 +277,15 @@ 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