*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2c83bb2046a55024dbe84cfaef4bcd32c52fa29..4583b6ba4548a1c50e66f8c8453796b459c25c24 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2000-05-30  Gerd Moellmann  <gerd@gnu.org>
 
+       * progmodes/perl-mode.el (perl-indent-line): When looking for a
+       label, ensure that the first colon isn't followed by another.
+
+       * paths.el (Info-default-directory-list): Doc fix.
+
        * net/net-utils.el (finger-X.500-host-regexps): New user-option.
        (finger): If HOST matches a regexp from finger-X.500-host-regexps,
        send a query containing USER only, not USER@HOST.

diff --git a/man/ChangeLog b/man/ChangeLog
index 3c052888b23c2e208a861ff6e751ce0bf751e097..45850586f46a169a73924543b1d1fdfc8a8c679f 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-30  Gerd Moellmann  <gerd@gnu.org>
+
+       * info.texi: Clarify description of Info-directory-list,
+       add description of Info-additional-directory-list.
+
 2000-05-25  Gerd Moellmann  <gerd@gnu.org>
 
        * eudc.texi: Fix @direntry, add @dircategory.

diff --git a/man/info.texi b/man/info.texi
index 30997676f1aaca9abc7c7a3996e46b76b26993ca..9d02e72ec35dcefb0ffa69cd70c111985eca7cf6 100644 (file)
--- a/man/info.texi
+++ b/man/info.texi
@@ -938,11 +938,19 @@ selected.
 
 @item Info-directory-list
 The list of directories to search for Info files.  Each element is a
-string (directory name) or @code{nil} (try default directory).
+string (directory name) or @code{nil} (try default directory).  If not
+initialized Info uses the environment variable @env{INFOPATH} to
+initialize it, or @code{Info-default-directory-list} if there is no
+@env{INFOPATH} variable in the environment.
+
+@item Info-additional-directory-list
+A list of additional directories to search for Info documentation files.
+These directories are not searched for merging the @file{dir} file.
 
 @item Info-directory
 The standard directory for Info documentation files.  Only used when the
 function @code{Info-directory} is called.
+
 @end table
 
 @node Create an Info File,  , Advanced Info, Top