From b876ee8971a8a040e14251f9733e4209ef7ad637 Mon Sep 17 00:00:00 2001
From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sun, 24 Apr 2016 14:55:15 +0200
Subject: [PATCH] Document the nil/default values of url-user-agent

* doc/misc/url.texi (Customization): Document the nil/default
values of url-user-agent.
---
 doc/misc/url.texi | 14 ++++++++++----
 etc/NEWS          |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 14a4c96cc47..0a96a5428b1 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -1337,10 +1337,16 @@ Connect directly.
 @end defopt
 
 @defopt url-user-agent
-The User Agent string used for sending HTTP/HTTPS requests.  The value
-should be a string or a function of no arguments that returns a
-string.  The default value is @w{@samp{User-Agent: @var{package-name}
-URL/Emacs}}, where @var{package-name} is the value of
+The User Agent string used for sending @acronym{HTTP}/@acronym{HTTPS}
+requests.  The value should be @code{nil}, which means that no
+@samo{User-Agent} header is generated, @code{default}, which means
+that a string is generated based on the setting of
+@code{url-privacy-leve}, a string or a function of no arguments that
+returns a string.
+
+The default is @code{default}, which means that the
+@w{@samp{User-Agent: @var{package-name} URL/Emacs}} string will be
+generated, where @var{package-name} is the value of
 @code{url-package-name} and its version, if they are non-@code{nil}.
 @end defopt
 
diff --git a/etc/NEWS b/etc/NEWS
index d0afb8462a9..6c7c9de4d5e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -284,7 +284,7 @@ domain.
 
 *** The URL package now support https over proxies supporting CONNECT.
 
----
++++
 *** `url-user-agent' now defaults to `default', and the User-Agent
 string is computed dynamically based on `url-privacy-level'.