From: Petr Hracek <phracek@redhat.com>
Date: Wed, 10 Apr 2013 01:39:02 +0000 (-0700)
Subject: * doc/man/emacs.1: Add some more command-line options.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1943^2~25
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8c1f2bb0fa5eec3f052f81082ccde733e337eb40;p=emacs.git

* doc/man/emacs.1: Add some more command-line options.

Fixes: debbugs:14165
---

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 645f4a4031e..1898160220b 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-10  Petr Hracek  <phracek@redhat.com>  (tiny change)
+
+	* emacs.1: Add some more command-line options.  (Bug#14165)
+
 2013-03-11  Glenn Morris  <rgm@gnu.org>
 
 	* Version 24.3 released.
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 4f7f8d28ada..b0f48f0176b 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -79,12 +79,22 @@ Go to the specified
 and
 .IR column .
 .TP
+.BI \-\-chdir " directory"
+Change to
+.IR directory .
+.TP
 .BR \-q ", " \-\-no\-init\-file
 Do not load an init file.
 .TP
+.BR \-nl ", " \-\-no\-shared\-memory
+Do not use shared memory.
+.TP
 .B \-\-no\-site\-file
 Do not load the site-wide startup file.
 .TP
+.BR \-nsl ", " \-\-no\-site\-lisp
+Do not add site-lisp directories to load-path.
+.TP
 .B \-\-no\-desktop
 Do not load a saved desktop.
 .TP
@@ -325,6 +335,9 @@ in iconified state.
 .BR \-nbc ", " \-\-no\-blinking\-cursor
 Disable blinking cursor.
 .TP
+.BI \-\-parent-id " xid"
+Set parent window.
+.TP
 .BR \-nw ", " \-\-no\-window\-system
 Tell
 .I Emacs