X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/1b3b0b5f0b92e018705d41954b9717b511f6bbe6..9705fb379eac387ad4a45550a8a43f171b91afaa:/man/cmdargs.texi

diff --git a/man/cmdargs.texi b/man/cmdargs.texi
index 28cb567f0c..fc17d7ec69 100644
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c   2003, 2004, 2005 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Emacs Invocation, X Resources, GNU Free Documentation License, Top
 @appendix Command Line Arguments for Emacs Invocation
@@ -293,7 +293,8 @@ Do not reload any saved desktop.  @xref{Saving Emacs Sessions}.
 @opindex --user
 @cindex load init file of another user
 Load @var{user}'s Emacs init file @file{~@var{user}/.emacs} instead of
-your own.
+your own@footnote{
+This option has no effect on MS-Windows.}.
 
 @item --debug-init
 @opindex --debug-init
@@ -469,6 +470,11 @@ to search for Emacs Lisp files---used to initialize @code{load-path}.
 @item EMACSPATH
 A colon-separated list of directories to search for executable
 files---used to initialize @code{exec-path}.
+@item EMAIL
+@vindex user-mail-address@r{, initialization}
+Your email address; used to initialize the Lisp variable
+@code{user-mail-address}, which the Emacs mail interface puts into
+the @samp{From} header of outgoing messages (@pxref{Mail Headers}).
 @item ESHELL
 Used for shell-mode to override the @env{SHELL} environment variable.
 @item HISTFILE
@@ -477,7 +483,7 @@ This variable defaults to @file{~/.bash_history} if you use Bash, to
 @file{~/.sh_history} if you use ksh, and to @file{~/.history}
 otherwise.
 @item HOME
-The location of the user's files in the directory tree; used for
+The location of your files in the directory tree; used for
 expansion of file names starting with a tilde (@file{~}).  On MS-DOS,
 it defaults to the directory from which Emacs was started, with
 @samp{/bin} removed from the end if it was present.  On Windows, the
@@ -525,11 +531,11 @@ environment and coding system.  @xref{Language Environments}.
 @item LOGNAME
 The user's login name.  See also @env{USER}.
 @item MAIL
-The name of the user's system mail inbox.
+The name of your system mail inbox.
 @item MH
 Name of setup file for the mh system.  (The default is @file{~/.mh_profile}.)
 @item NAME
-The real-world name of the user.
+Your real-world name.
 @item NNTPSERVER
 The name of the news server.  Used by the mh and Gnus packages.
 @item ORGANIZATION
@@ -551,7 +557,7 @@ The name of an interpreter used to parse and execute programs run from
 inside Emacs.
 @item SMTPSERVER
 The name of the outgoing mail server.  Used by the SMTP library
-(@pxref{Top,,Sending mail via SMTP,smtpmail}).
+(@pxref{Top,,,smtpmail,Sending mail via SMTP}).
 @cindex background mode, on @command{xterm}
 @item TERM
 The type of the terminal that Emacs is using.  This variable must be
@@ -577,8 +583,7 @@ does not use @env{TZ} at all.
 The user's login name.  See also @env{LOGNAME}.  On MS-DOS, this
 defaults to @samp{root}.
 @item VERSION_CONTROL
-Used to initialize the @code{version-control} variable (@pxref{Backup
-Names}).
+Used to initialize the @code{version-control} variable (@pxref{Numbered Backups}).
 @end table
 
 @node Misc Variables
@@ -653,15 +658,15 @@ changing any environment or registry settings.
 @pindex addpm, MS-Windows installation program
 @cindex registry, setting environment variables and resources on MS-Windows
 
-On MS-Windows, the installation program @command{addpm.exe} adds values
-for @env{emacs_dir}, @env{EMACSLOADPATH}, @env{EMACSDATA},
+Under MS-Windows, the installation program @command{addpm.exe} adds
+values for @env{emacs_dir}, @env{EMACSLOADPATH}, @env{EMACSDATA},
 @env{EMACSPATH}, @env{EMACSDOC}, @env{SHELL} and @env{TERM} to the
 @file{HKEY_LOCAL_MACHINE} section of the system registry, under
 @file{/Software/GNU/Emacs}.  It does this because there is no standard
 place to set environment variables across different versions of
-Windows.  Running @command{addpm.exe} is no longer strictly
-necessary in recent versions of Emacs, but if you are upgrading from
-an older version, running @command{addpm.exe} ensures that you do not have
+Windows.  Running @command{addpm.exe} is no longer strictly necessary
+in recent versions of Emacs, but if you are upgrading from an older
+version, running @command{addpm.exe} ensures that you do not have
 older registry entries from a previous installation, which may not be
 compatible with the latest version of Emacs.
 
@@ -988,7 +993,7 @@ emacs -ms coral -cr 'slate blue' &
 @samp{-rv} option or with the X resource @samp{reverseVideo}.
 
   The @samp{-fg}, @samp{-bg}, and @samp{-rv} options function on
-text-only terminals as well as on window systems.
+text-only terminals as well as on graphical displays.
 
 @node Window Size X
 @appendixsec Options for Window Size and Position
@@ -1008,7 +1013,9 @@ position of the initial Emacs frame:
 @cindex geometry, command-line argument
 Specify the size @var{width} and @var{height} (measured in character
 columns and lines), and positions @var{xoffset} and @var{yoffset}
-(measured in pixels).  This applies to all frames.
+(measured in pixels).  The @var{width} and @var{height} parameters
+apply to all frames, whereas @var{xoffset} and @var{yoffset} only to
+the initial frame.
 
 @item -fs
 @opindex -fs
@@ -1166,7 +1173,7 @@ for the initial Emacs frame.
 @appendixsec Icons
 @cindex icons (X Window System)
 
-  Most window managers allow the user to ``iconify'' a frame, removing
+  Most window managers allow you to ``iconify'' a frame, removing
 it from sight, and leaving a small, distinctive ``icon'' window in its
 place.  Clicking on the icon window makes the frame itself appear again.
 If you have many clients running at once, you can avoid cluttering up
@@ -1228,7 +1235,7 @@ Specify @var{pixels} as additional space to put between lines, in pixels.
 @itemx --no-blinking-cursor
 @opindex --no-blinking-cursor
 @cindex blinking cursor disable, command-line argument
-Disable the blinking cursor on graphical terminals.
+Disable the blinking cursor on graphical displays.
 
 @item -D
 @opindex -D