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, 15 insertions, 1 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index bc81ca4d4e7..cf110147ad8 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,17 @@
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+        * gpl.texi (GPL): Replace license with GPLv3.
+
+        * Relicense all FSF files to GPLv3 or later.
+
+2007-07-24  Michael Albinus  <michael.albinus@gmx.de>
+
+        * processes.texi (Synchronous Processes): Add
+        `process-file-shell-command',
+        (Asynchronous Processes): Mention restricted use of
+        `process-filter' and `process-sentinel' in
+        `start-file-process'.  Add `start-file-process-shell-command'.
+
 2007-07-17  Michael Albinus  <michael.albinus@gmx.de>
 
         * files.texi (Magic File Names): Introduce optional parameter
@@ -6205,7 +6219,7 @@ Tue Apr 11 12:23:28 1989  Robert J. Chassell  (bob@rice-chex.ai.mit.edu)
 
   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,