summaryrefslogtreecommitdiff
path: root/doc/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'doc/emacs')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/emacs.texi6
-rw-r--r--doc/emacs/misc.texi5
3 files changed, 15 insertions, 0 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 50eb89fe488..b3330022cb3 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-28 Chong Yidong <cyd@stupidchicken.com>
+
+ * misc.texi (emacsclient Options): Document server-port.
+
2011-08-27 Eli Zaretskii <eliz@gnu.org>
* frames.texi (Frame Commands): Advise setting focus-follows-mouse
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 060f939fa7a..5f0d66b95a3 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1054,6 +1054,12 @@ Hyperlinking and Navigation Features
* Goto Address mode:: Activating URLs.
* FFAP:: Finding files etc. at point.
+Emacs Lisp Packages
+
+* Package Menu:: Buffer for viewing and managing packages.
+* Package Installation:: Options for package installation.
+* Package Files:: Where packages are installed.
+
Customization
* Easy Customization:: Convenient way to browse and change settings.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 2dab70c512a..598f495784f 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1596,6 +1596,11 @@ runs, and (ii) provide @command{emacsclient} with the server file.
(One convenient way to do the latter is to put the server file on a
networked file system such as NFS.)
+@vindex server-port
+ When the Emacs server is using TCP, the variable @code{server-port}
+determines the port number to listen on; the default value,
+@code{nil}, means to choose a random port when the server starts.
+
@item -n
@itemx --no-wait
Let @command{emacsclient} exit immediately, instead of waiting until