X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/d48f09eef27cd7e74efcf812fc94577cb60527f7..90e4b32d3a45b460f8155389ceb857c9473a0793:/man/cmdargs.texi

diff --git a/man/cmdargs.texi b/man/cmdargs.texi
index f266913d26..fc17d7ec69 100644
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -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
@@ -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
@@ -652,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.
 
@@ -1007,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
@@ -1227,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