Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 9-10)

   - Update from CVS

2007-05-06  Richard M. Stallman  <rms@gnu.org>

   * lisp/emacs-lisp/eldoc.el (turn-on-eldoc-mode): Doc fix.

2007-05-03  Ryan Yeske  <rcyeske@gmail.com>

   * lisp/net/rcirc.el (rcirc-timeout-seconds): Increase to prevent unwanted
   disconnections.

2007-05-06  Richard M. Stallman  <rms@gnu.org>

   * lispref/processes.texi (Accepting Output): Revert most of previous change.

2007-05-05  Richard M. Stallman  <rms@gnu.org>

   * lispref/processes.texi (Accepting Output): accept-process-output
   uses microseconds, not milliseconds.  But that arg is obsolete.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-734

1 files changed, 9 insertions, 0 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 5ebee61ecf2..ba206646a4b 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-06  Richard Stallman  <rms@gnu.org>
+
+        * processes.texi (Accepting Output): Revert most of previous change.
+
+2007-05-05  Richard Stallman  <rms@gnu.org>
+
+        * processes.texi (Accepting Output): accept-process-output
+        uses microseconds, not milliseconds.  But that arg is obsolete.
+
 2007-05-04  Karl Berry  <karl@tug.org>
 
         * elisp.texi (EMACSVER) [smallbook]: 22.1, not 22.