# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1164215721 0
# Node ID 681d59f945bbb769b6a9f873b06e517bcbb1be35
# Parent  abd25d5e5b63a93b5c394e61d5a978bd6523534a
*** empty log message ***

diff -r abd25d5e5b63 -r 681d59f945bb etc/ChangeLog
--- a/etc/ChangeLog	Wed Nov 22 17:13:41 2006 +0000
+++ b/etc/ChangeLog	Wed Nov 22 17:15:21 2006 +0000
@@ -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 -r abd25d5e5b63 -r 681d59f945bb man/ChangeLog
--- a/man/ChangeLog	Wed Nov 22 17:13:41 2006 +0000
+++ b/man/ChangeLog	Wed Nov 22 17:15:21 2006 +0000
@@ -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.