aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2011-03-02 23:19:54 -0800
committerGlenn Morris <[email protected]>2011-03-02 23:19:54 -0800
commite7b21e2b5b7ca20a7c6d3be16f70806100fc0294 (patch)
treeda16302c55977d990660190e4929faa69f598b9f /doc
parente0535b76aff1d7a3ba9cc396d3024cbcb5585819 (diff)
* url.texi (Configuration): Update url-configuration-directory description.
Diffstat (limited to 'doc')
-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 6dd0fcbff7..aec9f9cf85 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 <[email protected]>
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 5ea3eabaff..42594457ab 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