* added documentation for the environment variables PRUNEPATHS, PRUNEFS,Debian_stable

    and NETPATHS for updatedb in find.texi and updatedb.1.  Added
    documentation for --prunefs in updatedb. (fixes bug #29755).

4 files changed, 48 insertions, 24 deletions

diff --git a/doc/find.info b/doc/find.info
index 484b1da8..330eddac 100644
--- a/doc/find.info
+++ b/doc/find.info
@@ -89,25 +89,25 @@ Node: Fixing Permissions56102
 Node: Classifying Files56661
 Node: Databases57379
 Node: Database Locations57993
-Node: Database Formats60106
-Node: New Database Format60757
-Node: Sample Database62319
-Node: Old Database Format62958
-Node: File Permissions64688
-Node: Mode Structure65256
-Node: Symbolic Modes67384
-Node: Setting Permissions68382
-Node: Copying Permissions70919
-Node: Changing Special Permissions71720
-Node: Conditional Executability73556
-Node: Multiple Changes74173
-Node: Umask and Protection75821
-Node: Numeric Modes76910
-Node: Reference78740
-Node: Invoking find79038
-Node: Invoking locate80085
-Node: Invoking updatedb81014
-Node: Invoking xargs82372
-Node: Primary Index85442
+Node: Database Formats60298
+Node: New Database Format60949
+Node: Sample Database62511
+Node: Old Database Format63150
+Node: File Permissions64880
+Node: Mode Structure65448
+Node: Symbolic Modes67576
+Node: Setting Permissions68574
+Node: Copying Permissions71111
+Node: Changing Special Permissions71912
+Node: Conditional Executability73748
+Node: Multiple Changes74365
+Node: Umask and Protection76013
+Node: Numeric Modes77102
+Node: Reference78932
+Node: Invoking find79230
+Node: Invoking locate80277
+Node: Invoking updatedb81206
+Node: Invoking xargs82756
+Node: Primary Index85826
 
 End Tag Table
diff --git a/doc/find.info-2 b/doc/find.info-2
index 2fd8fe14..6a9f8dbc 100644
--- a/doc/find.info-2
+++ b/doc/find.info-2
@@ -252,17 +252,20 @@ which directories each database contains entries for:
 
 `--netpaths='PATH...''
      Network (NFS, AFS, RFS, etc.) directories to put in the database.
-     Default is none.
+     The environment variable `NETPATHS' also sets this value.  Default
+     is none.
 
 `--prunepaths='PATH...''
      Directories to not put in the database, which would otherwise be.
+     The environment variable `PRUNEPATHS' also sets this value.
      Default is `/tmp /usr/tmp /var/tmp /afs'.
 
 `--prunefs='PATH...''
      File systems to not put in the database, which would otherwise be.
      Note that files are pruned when a file system is reached; Any file
      system mounted under an undesired file system will be ignored.
-     Default is `nfs NFS proc'.
+     The environment variable `PRUNEFS' also sets this value.  Default
+     is `nfs NFS proc'.
 
 `--output=DBFILE'
      The database file to build.  Default is system-dependent, but
@@ -901,17 +904,20 @@ Invoking `updatedb'
 
 `--netpaths='PATH...''
      Network (NFS, AFS, RFS, etc.) directories to put in the database.
-     Default is none.
+     The environment variable `NETPATHS' also sets this value.  Default
+     is none.
 
 `--prunepaths='PATH...''
      Directories to not put in the database, which would otherwise be.
+     The environment variable `PRUNEPATHS' also sets this value.
      Default is `/tmp /usr/tmp /var/tmp /afs'.
 
 `--prunefs='PATH...''
      File systems to not put in the database, which would otherwise be.
      Note that files are pruned when a file system is reached; Any file
      system mounted under an undesired file system will be ignored.
-     Default is `nfs NFS proc'.
+     The environment variable `PRUNEFS' also sets this value.  Default
+     is `nfs NFS proc'.
 
 `--output=DBFILE'
      The database file to build.  Default is system-dependent, but
diff --git a/doc/find.texi b/doc/find.texi
index 174105f4..bd874e0a 100644
--- a/doc/find.texi
+++ b/doc/find.texi
@@ -1861,10 +1861,13 @@ Default is @file{/}.
 
 @item --netpaths='@var{path}@dots{}'
 Network (NFS, AFS, RFS, etc.) directories to put in the database.
+The environment variable @code{NETPATHS} also sets this value.
 Default is none.
 
+
 @item --prunepaths='@var{path}@dots{}'
 Directories to not put in the database, which would otherwise be.
+The environment variable @code{PRUNEPATHS} also sets this value.
 Default is @file{/tmp /usr/tmp /var/tmp /afs}.
 
 @item --prunefs='@var{path}@dots{}'
@@ -1872,6 +1875,7 @@ File systems to not put in the database, which would otherwise be.
 Note that files are pruned when a file system is reached;
 Any file system mounted under an undesired file system will be
 ignored.
+The environment variable @code{PRUNEFS} also sets this value.
 Default is @file{nfs NFS proc}.
 
 @item --output=@var{dbfile}
@@ -2097,10 +2101,12 @@ Default is @file{/}.
 
 @item --netpaths='@var{path}@dots{}'
 Network (NFS, AFS, RFS, etc.) directories to put in the database.
+The environment variable @code{NETPATHS} also sets this value.
 Default is none.
 
 @item --prunepaths='@var{path}@dots{}'
 Directories to not put in the database, which would otherwise be.
+The environment variable @code{PRUNEPATHS} also sets this value.
 Default is @file{/tmp /usr/tmp /var/tmp /afs}.
 
 @item --prunefs='@var{path}@dots{}'
@@ -2108,6 +2114,7 @@ File systems to not put in the database, which would otherwise be.
 Note that files are pruned when a file system is reached;
 Any file system mounted under an undesired file system will be
 ignored.
+The environment variable @code{PRUNEFS} also sets this value.
 Default is @file{nfs NFS proc}.
 
 @item --output=@var{dbfile}
diff --git a/locate/updatedb.1 b/locate/updatedb.1
index 905fcfed..0b11fc80 100644
--- a/locate/updatedb.1
+++ b/locate/updatedb.1
@@ -47,12 +47,23 @@ Default is /.
 .TP
 .B \-\-netpaths='\fIpath1 path2...\fP'
 Network (NFS, AFS, RFS, etc.) directories to put in the database.
+The environment variable \fBNETPATHS\fP also sets this value.
 Default is none.
 .TP
 .B \-\-prunepaths='\fIpath1 path2...\fP'
 Directories to not put in the database, which would otherwise be.
+The environment variable \fBPRUNEPATHS\fP also sets this value.
 Default is /tmp /usr/tmp /var/tmp /afs.
 .TP
+.B \-\-prunefs='\fIpath...\fP'
+File systems to not put in the database, which would otherwise be.
+Note that files are pruned when a file system is reached;
+Any file system mounted under an undesired file system will be
+ignored.
+The environment variable
+\fBPRUNEFS\fP also sets this value.
+Default is \fInfs NFS proc\fP.
+.TP
 .B \-\-output=\fIdbfile\fP
 The database file to build.
 Default is system-dependent.  In Debian GNU/Linux, the default