# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 959719265 0
# Node ID 507b4d56cee2e5b10e2e284f9b9e22ec8cf4cf0e
# Parent  6fd90e67194fbb5aa9ad42a7034aa44d69778be3
*** empty log message ***

diff -r 6fd90e67194f -r 507b4d56cee2 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue May 30 20:40:42 2000 +0000
+++ b/lisp/ChangeLog	Tue May 30 20:41:05 2000 +0000
@@ -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 -r 6fd90e67194f -r 507b4d56cee2 man/ChangeLog
--- a/man/ChangeLog	Tue May 30 20:40:42 2000 +0000
+++ b/man/ChangeLog	Tue May 30 20:41:05 2000 +0000
@@ -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 -r 6fd90e67194f -r 507b4d56cee2 man/info.texi
--- a/man/info.texi	Tue May 30 20:40:42 2000 +0000
+++ b/man/info.texi	Tue May 30 20:41:05 2000 +0000
@@ -938,11 +938,19 @@
 
 @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