(Info-directory-list): Change doc string to reflect the

change in Info-default-directory-list.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22605feaad36867534cd2eba63489f0c6c7bf234..9385652c869aaaee63446a8a5fde1149533100aa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2000-12-14  Eli Zaretskii  <eliz@is.elta.co.il>
 
+       * paths.el (Info-default-directory-list): If
+       configure-info-directory is not one of the standard directories,
+       put it first in the list; otherwise put it last.  Doc string
+       changed accordingly.
+
+       * info.el (Info-directory-list): Change doc string to reflect the
+       change in Info-default-directory-list.
+
        * simple.el (delete-key-deletes-forward-mode): Treat ms-dos and
        windows-nt as windowed environments, even under -nw.
 

diff --git a/lisp/info.el b/lisp/info.el
index da25668b6846db06a64f09bea506a6ccc64cef1c..3b2e675f7f163fade140a0c4b4e7c6f8598a6497 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -108,11 +108,21 @@ variable INFOPATH to initialize it, or `Info-default-directory-list'
 if there is no INFOPATH variable in the environment.
 
 When `Info-directory-list' is initialized from the value of
-`Info-default-directory-list', the first element of the resulting
+`Info-default-directory-list', and Emacs is installed in one of the
+standard directories, the directory of Info files that come with Emacs
+is put last (so that local Info files override standard ones).
+
+When `Info-directory-list' is initialized from the value of
+`Info-default-directory-list', and Emacs is not installed in one
+of the standard directories, the first element of the resulting
 list is the directory where Emacs installs the Info files that
 come with it.  This is so that Emacs's own manual, which suits the
-version of Emacs you are using, will always be found first.  (If
-you want to override that, set INFOPATH in the environment.)
+version of Emacs you are using, will always be found first.  This
+is useful when you install an experimental version of Emacs without
+removing the standard installation.
+
+If you want to override the order of directories in
+`Info-default-directory-list', set INFOPATH in the environment.
 
 If you run the Emacs executable from the `src' directory in the Emacs
 source tree, and INFOPATH is not defined, the `info' directory in the