--- a/etc/xemacs.1	Mon Aug 13 09:00:04 2007 +0200
+++ b/etc/xemacs.1	Mon Aug 13 09:02:59 2007 +0200
@@ -1,4 +1,4 @@
-.TH XEMACS 1 "1996 June 23"
+.TH XEMACS 1 "1996 November 23"
 .UC 4
 .SH NAME
 xemacs \- Emacs: The Next Generation
@@ -30,7 +30,7 @@
 is in the
 .I XEmacs Reference
 .IR Manual ,
-which you can read on line using Info, a subsystem of
+which you can read on-line using Info, a subsystem of
 .IR XEmacs .
 Please look there for complete and up-to-date documentation.
 Complete documentation on using Emacs Lisp is available on-line
@@ -62,10 +62,10 @@
 find a command given its functionality, Help Key Binding (CTRL-h k)
 describes a given key sequence's effect, and Help Function (CTRL-h f)
 describes a given Lisp function specified by name.  You can also
-lookup key sequences in the
+look up key sequences in the
 .I XEmacs Reference Manual
 using Lookup Key Binding (CTRL-h CTRL-k),
-and lookup Lisp functions in the
+and look up Lisp functions in the
 .I XEmacs Lisp Programmer's Manual
 using Lookup Function (CTRL-h CTRL-f).  All of these help functions,
 and more, are available on the Help menu if you are using a window
@@ -99,58 +99,17 @@
 windows (Shell), outline editing (Outline), running a Lisp read-eval-print
 loop (Lisp-Interaction-Mode), and automated psychotherapy (Doctor).
 .PP
-There is an extensive reference manual, but
-users of other Emacsen
-should have little trouble adapting even
-without a copy.  Users new to Emacs will be able
-to use basic features fairly rapidly by studying the tutorial and
-using the self-documentation features.
+There is an extensive reference manual, but users of other Emacsen
+should have little trouble adapting even without a copy.  Users new to
+Emacs will be able to use basic features fairly rapidly by studying
+the tutorial and using the self-documentation features.
 .PP
 .SM XEmacs Options
 .PP
-The following options are processed in the order encountered:
-.TP 8
-.I file
-Edit
-.IR file \.
-.TP
-.BI \+ number
-Go to the line specified by
-.I number
-(do not insert a space between the "+" sign and
-the number).
-.TP
-.B \-help
-Print a help message and exit.
-.TP
-.B \-version
-Print the version number and exit.
-.TP
-.BI \-f " function, " \-funcall " function"
-Execute the lisp function
-.IR function \.
-.TP
-.BI \-l " file, " \-load " file"
-Load the Lisp code in the file
-.IR file \.
-.TP
-.BI \-eval " form"
-Evaluate the Lisp form
-.IR form \.
-.TP
-.BI \-insert " file"
-Insert
-.I file
-into the current buffer.
-.TP
-.B \-kill
-Exit
-.I XEmacs
-(useful with
-.BR \-batch ).
-.PP
-These options are processed only if they appear before all other
-options (and generally must be in the order given):
+XEmacs accepts all standard X Toolkit command line options when run in
+an X Windows environment.  In addition, the following options are accepted
+(when options imply a sequence of actions to perform, they are
+performed in the order encountered):
 .TP 8
 .BI \-t " file"
 Use specified
@@ -167,13 +126,12 @@
 .B \-eval
 options to specify files to execute and functions to call.
 .TP
-.B \-nw
+.B \-nw\ 
 Inhibit the use of any window-system-specific display code: use the
-current TTY.  This must be the first argument specified in the
-command line.
+current TTY.
 .TP
 .B \-debug\-init
-Enter the debugger if an error occurs in the init file.
+Enter the debugger if an error occurs loading the init file.
 .TP
 .B \-unmapped
 Do not map the initial frame.
@@ -188,6 +146,44 @@
 Load
 .IR user 's
 init file.
+.TP 8
+.I file
+Edit
+.IR file \.
+.TP
+.BI \+ number
+Go to the line specified by
+.I number
+(do not insert a space between the "+" sign and the number).
+.TP
+.B \-help, \-flags, \-?
+Print a help message and exit.
+.TP
+.B \-V, \-version,
+Print the version number and exit.
+.TP
+.BI \-f " function, " \-funcall " function"
+Execute the lisp function
+.IR function \.
+.TP
+.BI \-l " file, " \-load " file"
+Load the Lisp code in the file
+.IR file \.
+.TP
+.BI \-eval " form"
+Evaluate the Lisp form
+.IR form \.
+.TP
+.BI \-i " file, " \-insert " file"
+Insert
+.I file
+into the current buffer.
+.TP
+.B \-kill
+Exit
+.I XEmacs
+(useful with
+.BR \-batch ).
 .PP
 .SM Using XEmacs with X
 .PP
@@ -201,7 +197,7 @@
 so that you can continue using your original window.
 .PP
 .I XEmacs
-can be started with the following X switches:
+can be started with the following standard X options:
 .TP
 .BI \-geometry " ##x##+##+##"
 Specify the geometry of the initial window.  The ##'s represent a number;
@@ -593,8 +589,10 @@
 .br
 .ti -\w'CTRL-SHIFT-middle'u+4n
 META-left	Make a rectangular selection.
-.PP
 .SH FILES
+Lisp code is read at startup from the user's init file,
+\fB$HOME/.emacs\fP.
+
 /usr/local/info - files for the Info documentation browser
 (a subsystem of
 .IR XEmacs )
@@ -622,16 +620,12 @@
 
 /usr/local/lib/xemacs-$VERSION/$CONFIGURATION/DOC-$VERSION-XEmacs -
 contains the documentation strings for the Lisp primitives and
-preloaded Lisp functions of
-.IR XEmacs \.
-They are stored here to reduce the size of
-.I XEmacs
-proper.
+preloaded Lisp functions of \fIXEmacs\fP.
+They are stored here to reduce the size of \fIXEmacs\fP proper.
 
 .br
 /usr/local/lib/xemacs-$VERSION/etc/SERVICE - lists people offering
-various services to assist users of
-.IR XEmacs ,
+various services to assist users of \fIXEmacs\fP,
 including education, troubleshooting, porting and customization.
 
 /usr/local/lib/xemacs/lock - holds lock files that are made for all
@@ -708,8 +702,8 @@
 .I XEmacs
 was written by Chuck Thompson <cthomp@xemacs.org>, Ben Wing
 <wing@666.com>, Jamie Zawinski <jwz@netscape.com>, Richard Mlynarik
-<mly@adoc.xerox.com>, and many others.  It was based on an early
-version of
+<mly@adoc.xerox.com>, Martin Buchholz <mrb@eng.sun.com> and many
+others.  It was based on an early version of
 .I GNU Emacs Version
 .IR 19 ,
 written by Richard Stallman of the Free Software
@@ -747,17 +741,13 @@
 .IR 19 \.
 .PP
 Many others have also contributed significantly.  For more detailed
-information, including a long history of
-.I XEmacs
-from multiple viewpoints and pretty pictures and bios of the major
-.I XEmacs
+information, including a long history of \fIXEmacs\fP from multiple
+viewpoints and pretty pictures and bios of the major \fIXEmacs\fP
 contributors, see the
 .I XEmacs About Page
 (the About XEmacs option on the Help menu).
 .SH MORE INFORMATION
-For more information about
-.IR XEmacs ,
-see the
+For more information about \fIXEmacs\fP, see the
 .I XEmacs About Page
 (mentioned above),
 look in the file /usr/local/lib/xemacs-$VERSION/etc/NEWS,
@@ -765,19 +755,16 @@
 .PP
 http://www.xemacs.org/
 .PP
-for up-to-the-minute information about
-.IR XEmacs \.
+for up-to-the-minute information about \fIXEmacs\fP.
 .PP
 The
 .I XEmacs
 FAQ (Frequently Asked Questions) can be found at the Web site just listed.
 A possibly out-of-date version is also accessible through the Info system
-inside of
-.IR XEmacs \.
+inside of \fIXEmacs\fP.
 .PP
-The latest version of
-.I XEmacs
-can be downloaded using anonymous FTP from
+The latest version of \fIXEmacs\fP can be downloaded using anonymous
+FTP from
 .PP
 ftp://ftp.xemacs.org/pub/xemacs/
 .PP