[5431] Document info-no-defaults variable

[Gavin D. Smith]

Revision: 5431
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5431
Author:   gavin
Date:     2014-04-05 18:12:39 +0000 (Sat, 05 Apr 2014)
Log Message:
-----------
Document info-no-defaults variable

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/info-stnd.texi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-04-05 17:04:55 UTC (rev 5430)
+++ trunk/ChangeLog     2014-04-05 18:12:39 UTC (rev 5431)
@@ -1,5 +1,9 @@
 2014-04-05  Gavin Smith  <address@hidden>
 
+       * doc/info-stnd.texi: Document info-no-defaults.
+
+2014-04-05  Gavin Smith  <address@hidden>
+
        * Makefile.am: Condense AM_CPPFLAGS definition slightly.
        * info.c (main): Make --directory options build up infopath
        in the order they were specified.  Call infopath_init after

Modified: trunk/doc/info-stnd.texi
===================================================================
--- trunk/doc/info-stnd.texi    2014-04-05 17:04:55 UTC (rev 5430)
+++ trunk/doc/info-stnd.texi    2014-04-05 18:12:39 UTC (rev 5431)
@@ -213,21 +213,30 @@
 @itemx -d @var{directory-path}
 @cindex @code{--directory} (@code{-d}) command line option
 @cindex directory path
-Prepend @var{directory-path} to the list of directory paths searched
address@hidden INFOPATH
address@hidden
+Add @var{directory-path} to the list of directory paths searched
 when Info needs to find a file.  You may issue @code{--directory}
 multiple times; once for each directory which contains Info files,
 or with a list of such directories separated by a colon (or semicolon
-on MS-DOS/MS-Windows).  In the absence of @code{--directory} options
-the list of directories searched by Info is constructed from the
-value of the environment variable @code{INFOPATH}.  The value of
+on MS-DOS/MS-Windows).
+
+Directories specified in the environment variable @env{INFOPATH} are added
+to the directories specified with @code{--directory}, if any.  The value of
 @code{INFOPATH} is a list of directories usually separated by a colon;
-on MS-DOS/MS-Windows systems, the semicolon is used.  If you do not
-define @code{INFOPATH}, Info uses a default path defined when Info was
-built as the initial list of directories.  If the value of
+on MS-DOS/MS-Windows systems, the semicolon is used.  If the value of
 @code{INFOPATH} ends with a colon (or semicolon on MS-DOS/MS-Windows),
 the initial list of directories is constructed by appending the
 build-time default to the value of @code{INFOPATH}.
 
+If you do not define @code{INFOPATH}, Info uses a default path defined
+when Info was built as the initial list of directories.  
+
+Regardless of whether @code{INFOPATH} is defined, the default documentation
+directory defined when Info was built is added to the search path.  If you do
+not want this directory to be included, set the @code{infopath-no-defaults}
+variable to @code{On}.  (@xref{infopath-no-defaults}.)
+ 
 If the list of directories contains the element @code{PATH}, that
 element is replaced by a list of directories derived from the value of
 the environment variable @code{PATH}.  Each path element of the form
@@ -2076,6 +2085,15 @@
 tells Info it is okay to garbage collect the text of the nodes of a
 file which was compressed on disk.
 
address@hidden infopath-no-defaults
address@hidden infopath-no-defaults
address@hidden
+Used in conjunction with the INFOPATH environment variable.
+(@xref{INFOPATH}.)
+When set to @code{On}, the default documentation directory defined
+when Info was built (usually @file{/usr/share/info}) is not added to the 
+search path for Info files.
+
 @item ISO-Latin
 @cindex ISO Latin characters
 @vindex ISO-Latin