Merge from origin/emacs-25

d8affa3 Use ‘T *restrict’ proto, not ‘T[restrict]’
d38d2a8 Fix documentation of 'url-retrieve-synchronously'
586b213 * lisp/url/url.el (url-retrieve-synchronously): Doc fix.  (Bu...

# Conflicts:
#	doc/misc/url.texi
#	lisp/url/url.el

1 files changed, 4 insertions, 3 deletions

diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index fe03234d111..097f626e718 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -295,9 +295,10 @@ and returns a buffer containing the data.  The return value is
 @code{nil} if there is no data associated with the URL (as is the case
 for @code{dired}, @code{info}, and @code{mailto} URLs).
 
-If @var{silent} is non-@code{nil}, don't do any messaging while
-retrieving.  If @var{inhibit-cookies} is non-@code{nil}, refuse to
-store cookies.  If @var{timeout} is passed, it should be a number that
+If the optional argument @var{silent} is non-@code{nil}, progress
+messages are suppressed.  If the optional argument @var{no-cookies} is
+non-@code{nil}, cookies are not stored or sent.  If the optional
+argument @var{timeout} is non-@code{nil}, it should be a number that
 says (in seconds) how long to wait for a response before giving up.
 @end defun