Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 824-838)

   - Update from CVS
   - Merge from emacs--rel--22
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Fix void function definition error in cus-edit.el
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * emacs--rel--22  (patch 70-83)

   - Update from CVS
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Indicate that emacs--devo--0--patch-834 does not need to be applied
   - Merge from gnus--rel--5.10
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * gnus--rel--5.10  (patch 239-241)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28

1 files changed, 39 insertions, 1 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index d4049ff11cd..703b3d3441f 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,41 @@
+2007-07-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Frequently Asked Questions): Point to mode line
+        extension in Emacs 23.1.
+
+        * trampver.texi: Update release number.
+
+2007-07-27  Glenn Morris  <rgm@gnu.org>
+
+        * calc.texi (Copying)
+        * emacs.texi (Copying): Include license text from gpl.texi, rather than
+        in-line.
+
+        * gpl.texi: New file with text of GPL.
+        * Makefile.in (EMACSSOURCES): Add gpl.texi.
+
+2007-07-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vc2-xtra.texi (Customizing VC): Add GIT and HG.
+
+        * dired.texi (Wdired): Mention C-x C-q key binding.
+
+2007-07-28  Nick Roberts  <nickrob@snap.net.nz>
+
+        * building.texi (GDB Graphical Interface): Qualify use of "M-x gdba".
+
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+        * calc.texi (Copying)
+        * emacs.texi (Copying): Replace license with GPLv3.
+
+        * Relicense all FSF files to GPLv3 or later.
+
+2007-07-24  Glenn Morris  <rgm@gnu.org>
+
+        * calendar.texi (Writing Calendar Files): cal-tex-diary etc only work
+        for some calendars.
+
 2007-07-23  Nick Roberts  <nickrob@snap.net.nz>
 
         * screen.texi (Mode Line): Describe new mode-line flag that shows if
@@ -8091,7 +8129,7 @@
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,