aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-03-02 23:19:54 -0800
committerGlenn Morris2011-03-02 23:19:54 -0800
commite7b21e2b5b7ca20a7c6d3be16f70806100fc0294 (patch)
treeda16302c55977d990660190e4929faa69f598b9f
parente0535b76aff1d7a3ba9cc396d3024cbcb5585819 (diff)
downloademacs-e7b21e2b5b7ca20a7c6d3be16f70806100fc0294.tar.gz
emacs-e7b21e2b5b7ca20a7c6d3be16f70806100fc0294.zip
* url.texi (Configuration): Update url-configuration-directory description.
-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 @@
2 2
3 * url.texi (Dealing with HTTP documents): Remove reference to 3 * url.texi (Dealing with HTTP documents): Remove reference to
4 function url-decode-text-part; never seems to have existed. (Bug#6038) 4 function url-decode-text-part; never seems to have existed. (Bug#6038)
5 (Configuration): Update url-configuration-directory description.
5 6
62011-03-02 Glenn Morris <rgm@gnu.org> 72011-03-02 Glenn Morris <rgm@gnu.org>
7 8
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.
116@cindex @file{~/.url} 116@cindex @file{~/.url}
117@cindex configuration files 117@cindex configuration files
118The directory in which URL configuration files, the cache etc., 118The directory in which URL configuration files, the cache etc.,
119reside. Default @file{~/.url}. 119reside. The old default was @file{~/.url}, and this directory
120is still used if it exists. The new default is a @file{url/}
121directory in @code{user-emacs-directory}, which is normally
122@file{~/.emacs.d}.
120@end defvar 123@end defvar
121 124
122@node Parsed URLs 125@node Parsed URLs