2 files changed, 10 insertions, 11 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 0a6b4b35bee..b3ac07ec269 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,8 +1,6 @@
 2006-10-31  Tim Van Holder  <tim.vanholder@gmail.com>  (tiny change)
 
-        Fixes to emacsclient.c for GNU/Linux.
-        * emacsclient.c [!WINDOWSNT] <top level>: Include <netinet/in.h> and
-        <sys/ioctl.h>.
+        * emacsclient.c [!WINDOWSNT]: Include <netinet/in.h> and <sys/ioctl.h>.
         (INVALID_SOCKET): Define.
         (initialize_sockets): Put #endif at the right place.
         (set_local_socket): Use progname, not argv[0].
@@ -41,7 +39,6 @@
         set_local_socket.  Use set_socket.  Get answers from server.el with
         recv(), not file stream functions.
 
-
 2006-10-09  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (../src/config.h): Fix error message.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 968f2e65f0f..83c082df439 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,8 @@
-2006-10-31 Ramprasad B <ramprasad@gnu.org>
+2006-10-31 Yoni Rabkin Katzenell <yoni-r@actcom.com>  (tiny change)
 
-        * lisp/faces.el: Installed describe-face sample text of
-        `yoni-r@actcom.com: etc/TODO item: describe-face sample text'.
+        * lisp/faces.el (faces-sample-overlay): New defvar.
+        (faces-sample-overlay): New function to show face sample text.
+        (describe-face): Use it.
 
 2006-10-31  Stephen Leake  <stephen_leake@stephe-leake.org>
 
@@ -25,8 +26,8 @@
         * server.el: Add support for TCP sockets.
         (server-use-tcp, server-host, server-auth-dir): New options.
         (server-auth-key): New variable.
-        (server-ensure-safe-dir): Create nonexistent parent dirs.  Ignore
-        Unix-style file modes on Windows.
+        (server-ensure-safe-dir): Create nonexistent parent dirs.
+        Ignore Unix-style file modes on Windows.
         (server-start): Crete a TCP or Unix socket according to the value
         of `server-use-tcp'.  For TCP sockets, create the id/auth file in
         `server-auth-dir' directory.
@@ -81,8 +82,9 @@
         compilers.
 
 2006-10-29  Lars Hansen  <larsh@soem.dk>
-        * net/tramp.el (with-parsed-tramp-file-name): Correct debug
-        spec.  Highlight as keyword.
+
+        * net/tramp.el (with-parsed-tramp-file-name): Correct debug spec.
+        Highlight as keyword.
         (tramp-do-copy-or-rename-file): Correct data for 'file-already-exists.
         Don't call tramp-method-out-of-band-p for local files.
         (tramp-touch): Quote file name.