Integrate:perl-5.8.3

[ 22149]
Subject:  Doc patches for File::Find
Message-Id:  <20040112061050.GB7308@petdance.com>

[ 22150]
Bump version number as file has changed since 5.8.2
p4raw-link: @22150 on //depot/perl: c00d347234332685d55c16ee293469b32d282e60
p4raw-link: @22149 on //depot/perl: 95e23d19fd3460d17a5e5ec2660e19f50596f531

p4raw-id: //depot/maint-5.8/perl@22151
p4raw-integrated: from //depot/perl@22148 'copy in' lib/File/Find.pm
	(@22149..)

1 files changed, 30 insertions, 21 deletions

diff --git a/lib/File/Find.pm b/lib/File/Find.pm
index 4c15d384d7..f9fb16b12c 100644
--- a/lib/File/Find.pm
+++ b/lib/File/Find.pm
@@ -3,7 +3,7 @@ use 5.006;
 use strict;
 use warnings;
 use warnings::register;
-our $VERSION = '1.05';
+our $VERSION = '1.06';
 require Exporter;
 require Cwd;
 
@@ -44,27 +44,29 @@ but have subtle differences.
   find(\&wanted,  @directories);
   find(\%options, @directories);
 
-find() does a breadth-first search over the given @directories in the
+C<find()> does a breadth-first search over the given C<@directories> in the
 order they are given.  In essence, it works from the top down.
 
-For each file or directory found the &wanted subroutine is called (see
-below for details).  Additionally, for each directory found it will go
-into that directory and continue the search.
+For each file or directory found, the C<&wanted> subroutine is called,
+with the return code ignored.  (See below for details on how to use
+the C<&wanted> function).  Additionally, for each directory found,
+it will go into that directory and continue the search.
 
 =item B<finddepth>
 
   finddepth(\&wanted,  @directories);
   finddepth(\%options, @directories);
 
-finddepth() works just like find() except it does a depth-first search.
+C<finddepth()> works just like C<find()> except it does a depth-first search.
 It works from the bottom of the directory tree up.
 
 =back
 
 =head2 %options
 
-The first argument to find() is either a hash reference describing the
-operations to be performed for each file, or a code reference.  The
+The first argument to C<find()> is either a code reference to your
+C<&wanted> function, or a hash reference describing the operations
+to be performed for each file.  The
 code reference is described in L<The wanted function> below.
 
 Here are the possible keys for the hash:
@@ -79,15 +81,15 @@ described in L<The wanted function> below.
 =item C<bydepth>
 
 Reports the name of a directory only AFTER all its entries
-have been reported.  Entry point finddepth() is a shortcut for
-specifying C<{ bydepth =E<gt> 1 }> in the first argument of find().
+have been reported.  Entry point C<finddepth()> is a shortcut for
+specifying C<<{ bydepth => 1 }>> in the first argument of C<find()>.
 
 =item C<preprocess>
 
 The value should be a code reference. This code reference is used to 
-preprocess the current directory. The name of currently processed 
-directory is in $File::Find::dir. Your preprocessing function is 
-called after readdir() but before the loop that calls the wanted() 
+preprocess the current directory. The name of the currently processed 
+directory is in C<$File::Find::dir>. Your preprocessing function is
+called after C<readdir()>, but before the loop that calls the C<wanted()>
 function. It is called with a list of strings (actually file/directory 
 names) and is expected to return a list of strings. The code can be 
 used to sort the file/directory names alphabetically, numerically, 
@@ -98,7 +100,7 @@ I<follow> or I<follow_fast> are in effect, C<preprocess> is a no-op.
 
 The value should be a code reference. It is invoked just before leaving 
 the currently processed directory. It is called in void context with no 
-arguments. The name of the current directory is in $File::Find::dir. This 
+arguments. The name of the current directory is in C<$File::Find::dir>. This 
 hook is handy for summarizing a directory, such as calculating its disk 
 usage. When I<follow> or I<follow_fast> are in effect, C<postprocess> is a 
 no-op.
@@ -117,7 +119,7 @@ If either I<follow> or I<follow_fast> is in effect:
 =item *
 
 It is guaranteed that an I<lstat> has been called before the user's
-I<wanted()> function is called. This enables fast file checks involving S< _>.
+C<wanted()> function is called. This enables fast file checks involving S< _>.
 
 =item *
 
@@ -131,7 +133,7 @@ pathname of the file with all symbolic links resolved
 This is similar to I<follow> except that it may report some files more
 than once.  It does detect cycles, however.  Since only symbolic links
 have to be hashed, this is much cheaper both in space and time.  If
-processing a file more than once (by the user's I<wanted()> function)
+processing a file more than once (by the user's C<wanted()> function)
 is worse than just taking time, the option I<follow> should be used.
 
 =item C<follow_skip>
@@ -140,8 +142,10 @@ C<follow_skip==1>, which is the default, causes all files which are
 neither directories nor symbolic links to be ignored if they are about
 to be processed a second time. If a directory or a symbolic link 
 are about to be processed a second time, File::Find dies.
+
 C<follow_skip==0> causes File::Find to die if any file is about to be
 processed a second time.
+
 C<follow_skip==2> causes File::Find to ignore any duplicate files and
 directories but to proceed normally otherwise.
 
@@ -155,7 +159,7 @@ will be silently ignored.
 
 =item C<no_chdir>
 
-Does not C<chdir()> to each directory as it recurses. The wanted()
+Does not C<chdir()> to each directory as it recurses. The C<wanted()>
 function will need to be aware of this, of course. In this case,
 C<$_> will be the same as C<$File::Find::name>.
 
@@ -183,8 +187,13 @@ including all its sub-directories. The default is to 'die' in such a case.
 
 =head2 The wanted function
 
-The wanted() function does whatever verifications you want on each
-file and directory.  It takes no arguments but rather does its work
+The C<wanted()> function does whatever verifications you want on
+each file and directory.  Note that despite its name, the C<wanted()>
+function is a generic callback function, and does B<not> tell
+File::Find if a file is "wanted" or not.  In fact, its return value
+is ignored.
+
+The wanted function takes no arguments but rather does its work
 through a collection of variables.
 
 =over 4
@@ -199,7 +208,7 @@ through a collection of variables.
 
 Don't modify these variables.
 
-For example, when examining the file /some/path/foo.ext you will have:
+For example, when examining the file F</some/path/foo.ext> you will have:
 
     $File::Find::dir  = /some/path/
     $_                = foo.ext
@@ -251,7 +260,7 @@ produces something like:
 
 Notice the C<_> in the above C<int(-M _)>: the C<_> is a magical
 filehandle that caches the information from the preceding
-stat(), lstat(), or filetest.
+C<stat()>, C<lstat()>, or filetest.
 
 Here's another interesting wanted function.  It will find all symbolic
 links that don't resolve: