From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 22 Nov 2006 17:15:21 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.92~563
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=53e842f162dc525ad4d21cf7e2d1f9e9ef9b06a7;p=emacs.git

*** empty log message ***
---

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 5d43d90da42..6d7aad5a56a 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-22  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacsclient.1 (DESCRIPTION): Suggest also `server-mode'.
+	(OPTIONS): Document `-f', `--server-file' and EMACS_SERVER_FILE.
+
 2006-11-20  Michael Olson  <mwolson@gnu.org>
 
 	* NEWS: Change M-x erc-select to M-x erc.
diff --git a/man/ChangeLog b/man/ChangeLog
index c03f678bf1a..018b24342b0 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-22  Juanma Barranquero  <lekktu@gmail.com>
+
+	* anti.texi (Antinews): Mention --server-file and TCP sockets.
+
 2006-11-20  Michael Olson  <mwolson@gnu.org>
 
 	* erc.texi: Call this the 5.2 stable pre-release of ERC.