aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/url
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2012-02-10 09:22:09 -0800
committerGlenn Morris <[email protected]>2012-02-10 09:22:09 -0800
commita48ec60ca1e8df977b155e43e13199a7cb3e4685 (patch)
tree8f0a710505faaf8c7341ac2582da3f5093e21961 /lisp/url
parent578ad769a6626dca5735ed769b19f0d12933e260 (diff)
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.
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/ChangeLog4
-rw-r--r--lisp/url/url-queue.el6
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 8f0cbcb259..14aaa4bf11 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-10 Glenn Morris <[email protected]>
+
+ * url-queue.el (url-queue-retrieve): Fic previous doc fix.
+
2012-02-10 Andreas Schwab <[email protected]>
* 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 62e5e2f84d..9dfee48591 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