merge upstream

[gnu-emacs] / doc / man / emacs.1

diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 6db2bfe2d1c2abff7542d6adc3ad3003b01def7c..a306edc3ca9d4eb47f1d8633e32a54453c27a25c 100644 (file)
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -1,5 +1,5 @@
 .\" See section COPYING for copyright and redistribution information.
-.TH EMACS 1 "2007 April 13" "GNU Emacs 24.2.93"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 24.3.50"
 .
 .
 .SH NAME
@@ -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
@@ -432,7 +445,7 @@ Gives frames menu bars if
 .IR on ;
 don't have menu bars if
 .IR off .
-See the Emacs manual, sections "Lucid Resources" and "LessTif
+See the Emacs manual, sections "Lucid Resources" and "Motif
 Resources", for how to control the appearance of the menu bar
 if you have one.
 .TP
@@ -479,7 +492,7 @@ The scroll bar width in pixels, equivalent to the frame parameter
 Font name for pop-up menu items, in non-toolkit versions of
 .IR Emacs .
 (For toolkit versions, see the Emacs manual, sections
-"Lucid Resources" and "LessTif Resources".)
+"Lucid Resources" and "Motif Resources".)
 .TP
 .BR selectionTimeout " (class " SelectionTimeout )
 Number of milliseconds to wait for a selection reply.