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

2 files changed, 15 insertions, 6 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.
diff --git a/lispref/processes.texi b/lispref/processes.texi
index fbc8b785c11..81cac3e5046 100644
--- a/lispref/processes.texi
+++ b/lispref/processes.texi
@@ -1307,13 +1307,13 @@ The arguments @var{seconds} and @var{millisec} let you specify timeout
 periods.  The former specifies a period measured in seconds and the
 latter specifies one measured in milliseconds.  The two time periods
 thus specified are added together, and @code{accept-process-output}
-returns after that much time whether or not there has been any
+returns after that much time, whether or not there has been any
 subprocess output.
-
-The argument @var{seconds} need not be an integer.  If it is a floating
-point number, this function waits for a fractional number of seconds.
-If @var{seconds} is 0, the function accepts whatever output is
-pending but does not wait.
+  
+The argument @var{millisec} is semi-obsolete nowadays because
+@var{seconds} can be a floating point number to specify waiting a
+fractional number of seconds.  If @var{seconds} is 0, the function
+accepts whatever output is pending but does not wait.
 
 @c Emacs 22.1 feature
 If @var{process} is a process, and the argument @var{just-this-one} is