Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org

[gnu-emacs] / lisp / server.el

diff --git a/lisp/server.el b/lisp/server.el
index 64224d2a310db23604ade84b658a3769d4f7cc57..05ac345d9048cd1bb75842d69f30c410e7348bbd 100644 (file)
--- 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).