summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/misc/ChangeLog1
-rw-r--r--doc/misc/url.texi5
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 6dd0fcbff74..aec9f9cf858 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -2,6 +2,7 @@
* url.texi (Dealing with HTTP documents): Remove reference to
function url-decode-text-part; never seems to have existed. (Bug#6038)
+ (Configuration): Update url-configuration-directory description.
2011-03-02 Glenn Morris <rgm@gnu.org>
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 5ea3eabaff3..42594457ab1 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -116,7 +116,10 @@ The meaning of the @var{path} component depends on the service.
@cindex @file{~/.url}
@cindex configuration files
The directory in which URL configuration files, the cache etc.,
-reside. Default @file{~/.url}.
+reside. The old default was @file{~/.url}, and this directory
+is still used if it exists. The new default is a @file{url/}
+directory in @code{user-emacs-directory}, which is normally
+@file{~/.emacs.d}.
@end defvar
@node Parsed URLs