From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 28 Aug 2011 18:46:38 +0000 (-0400)
Subject: * lisp/server.el (server-port): Doc fix.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~48
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a1ff57fac7cba948020a7360eb630475945cbf8;p=emacs.git

* lisp/server.el (server-port): Doc fix.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39ac42fe6b0..4af6010b556 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-28  Chong Yidong  <cyd@stupidchicken.com>
+
+	* server.el (server-port): Doc fix.
+
 2011-08-28  Alan Mackenzie  <acm@muc.de>
 
 	* progmodes/cc-fonts.el
diff --git a/lisp/server.el b/lisp/server.el
index c91f10b6584..63d46a365c9 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -112,7 +112,10 @@ If set, the server accepts remote connections; otherwise it is local."
 (put 'server-host 'risky-local-variable t)
 
 (defcustom server-port nil
-  "The port number that the server process should listen on."
+  "The port number that the server process should listen on.
+This variable only takes effect when the Emacs server is using
+TCP instead of local sockets.  A nil value means to use a random
+port number."
   :group 'server
   :type '(choice
           (string :tag "Port number")