summaryrefslogtreecommitdiff
path: root/lisp/server.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-02-12 20:31:09 -0800
committerGlenn Morris <rgm@gnu.org>2013-02-12 20:31:09 -0800
commit01fcc3a532872b29784a4d888ab9cc1aef0eed01 (patch)
treee1fba1dfe3ec5b61ddc3e5e3824e4536b2c39429 /lisp/server.el
parentd0009c7351874e853c63ce67cea6103f33afa60b (diff)
parent1a359750bbac95fd6bf8fe1233e747a1d26f0082 (diff)
Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org
Diffstat (limited to 'lisp/server.el')
-rw-r--r--lisp/server.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/server.el b/lisp/server.el
index 64224d2a310..05ac345d904 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -154,7 +154,7 @@ long-lived shared key will decrease security (especially since
the key is transmitted as plain-text).
In some situations however, it can be difficult to share randomly
-generated passwords with remote hosts (eg. no shared directory),
+generated passwords with remote hosts (e.g., no shared directory),
so you can set the key with this variable and then copy the
server file to the remote host (with possible changes to IP
address and/or port if that applies).