Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-53
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-54
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-55
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-56
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-70

1 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3dd7f76f945..05ce35671f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-25  Jerome Marant  <jmarant@free.fr>  (tiny change)
+
+        * make-dist (lispref): Do include lispref/index.texi.
+
 2004-01-06  Eric Hanchrow <offby1@blarg.net> (tiny change)
 
         * make-dist (tempdir): Include cursors in nt/icons
@@ -14,7 +18,7 @@
 2003-12-24  Andreas Schwab  <schwab@suse.de>
 
         * configure.in: Check for <sys/socket.h>.  Include it before
-        including <net/if.h>.  Move check for <net/if.h> before it's use.
+        including <net/if.h>.  Move check for <net/if.h> before its use.
 
 2003-12-24  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>