From: Glenn Morris <rgm@gnu.org>
Date: Fri, 3 Oct 2008 07:06:46 +0000 (+0000)
Subject: (USAGE1): Add --daemon.
X-Git-Tag: emacs-pretest-23.0.90~2674
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=598898a721ee22200874751a8826411e818b6145;p=emacs.git

(USAGE1): Add --daemon.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 3c51f770eba..05447ddb884 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-03  Glenn Morris  <rgm@gnu.org>
+
+	* emacs.c (USAGE1): Add --daemon.
+
 2008-10-02  Eli Zaretskii  <eliz@gnu.org>
 
 	* process.c (procfs_system_process_attributes): Multiply `pcpu' by
diff --git a/src/emacs.c b/src/emacs.c
index f94d2d39ae4..2fb975c0fc1 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -257,6 +257,7 @@ read the main documentation for these command-line arguments.\n\
 Initialization options:\n\
 \n\
 --batch                     do not do interactive display; implies -q\n\
+--daemon                    start a server in the background\n\
 --debug-init                enable Emacs Lisp debugger for init file\n\
 --display, -d DISPLAY       use X server DISPLAY\n\
 --multibyte, --no-unibyte   inhibit the effect of EMACS_UNIBYTE\n\