[Emacs-diffs] Changes to emacs/man/misc.texi,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       06/12/09 02:53:21

Index: misc.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/man/misc.texi,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- misc.texi   8 Dec 2006 17:02:33 -0000       1.96
+++ misc.texi   9 Dec 2006 02:53:21 -0000       1.97
@@ -1406,23 +1406,18 @@
 
 @cindex @env{EMACS_SERVER_FILE} environment variable
 When you start the Emacs server (by calling @code{server-start}),
-Emacs creates a file with information about the TCP connection to the
-server: the host where Emacs runs, the port where it listens for
address@hidden requests, and the authentication string to use for
-the connection.  @code{emacsclient} uses this information if it needs
-to connect to the server via TCP.  By default, this TCP configuration
-file is placed in the @file{~/.emacs.d/server/} address@hidden
-On MS-Windows, if @env{HOME} is not set or the TCP configuration file
-cannot be found there, Emacs in addition attempts to find the file in
-the @file{.emacs.d/server/} subdirectory of the directory pointed
-to by the @env{APPDATA} environment variable, which is a user-specific
-directory for application data files.  This is similar to what Emacs
-does on MS-Windows to search for the user's @file{.emacs} file.}
-; you can
-direct @code{emacsclient} to use a different file with the @samp{-f
address@hidden or @address@hidden option, or by defining
-the @env{EMACS_SERVER_FILE} environment variable that points to the
-non-default TCP configuration file.
+Emacs creates a file with information about TCP connection to the
+server: the host where Emacs is running, the port where it is
+listening, and an authentication string.  @code{emacsclient} uses this
+information if it needs to connect to the server via TCP.  By default,
+the file goes in the @file{~/.emacs.d/server/} address@hidden
+MS-Windows, if @env{HOME} is not set or the TCP configuration file
+cannot be found there, Emacs also looks for the file in the
address@hidden/server/} subdirectory of the directory pointed to by
+the @env{APPDATA} environment variable.}.  You can specify the file
+name to use with the @samp{-f @var{file}} or
address@hidden@var{file}} options, or by setting
address@hidden environment variable to the file name.
 
 @node Printing, Sorting, Emacs Server, Top
 @section Printing Hard Copies