From: Glenn Morris <rgm@gnu.org>
Date: Fri, 10 Feb 2012 17:22:09 +0000 (-0800)
Subject: Fix previous URL doc change
X-Git-Tag: emacs-pretest-24.0.94~188
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a48ec60ca1e8df977b155e43e13199a7cb3e4685;p=emacs.git

Fix previous URL doc change

* lisp/url/url-queue.el (url-queue-retrieve): Fic previous doc fix.

* doc/misc/url.texi (Retrieving URLs): Update url-retrieve arguments.
Mention url-queue-retrieve.

* etc/NEWS: Related edit.
---

diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index e60aebb665b..771430251b6 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -216,10 +216,10 @@ non-@code{nil}, do not store or send cookies.
 @vindex url-queue-parallel-processes
 @vindex url-queue-timeout
 @defun url-queue-retrieve url callback &optional cbargs silent no-cookies
-This acts like the @code{url-retrieve} function, but downloads in
-parallel.  The option @code{url-queue-parallel-processes} controls the
-number of concurrent processes, and the option @code{url-queue-timeout}
-sets a timeout in seconds.
+This acts like the @code{url-retrieve} function, but with limits on
+the degree of parallelism.  The option @code{url-queue-parallel-processes}
+controls the number of concurrent processes, and the option
+@code{url-queue-timeout} sets a timeout in seconds.
 @end defun
 
 @node Supported URL Types
diff --git a/etc/NEWS b/etc/NEWS
index 3306c5cdfc8..9929f326e44 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -858,8 +858,9 @@ default value to "".
 remote machines that support SELinux.
 
 +++
-** New function, url-queue-retrieve, fetches URLs asynchronously like
-url-retrieve does, but in parallel.
+** New function, `url-queue-retrieve', which behaves like url-retrieve,
+but with limits (`url-queue-parallel-processes', `url-queue-timeout') on
+the degree of parallelism.
 
 ** VC and related modes
 
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 8f0cbcb2594..14aaa4bf113 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-10  Glenn Morris  <rgm@gnu.org>
+
+	* url-queue.el (url-queue-retrieve): Fic previous doc fix.
+
 2012-02-10  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* url-http.el (url-http-clean-headers): Return the number of
diff --git a/lisp/url/url-queue.el b/lisp/url/url-queue.el
index 62e5e2f84d4..9dfee485918 100644
--- a/lisp/url/url-queue.el
+++ b/lisp/url/url-queue.el
@@ -57,9 +57,9 @@
 (defun url-queue-retrieve (url callback &optional cbargs silent inhibit-cookies)
   "Retrieve URL asynchronously and call CALLBACK with CBARGS when finished.
 This is like `url-retrieve' (which see for details of the arguments),
-but downloads in parallel.  The variable `url-queue-parallel-processes'
-sets the number of concurrent processes.  The variable `url-queue-timeout'
-sets a timeout."
+but with limits on the degree of parallelism.  The variable
+`url-queue-parallel-processes' sets the number of concurrent processes.
+The variable `url-queue-timeout' sets a timeout."
   (setq url-queue
 	(append url-queue
 		(list (make-url-queue :url url