Upgrade to ExtUtils::MakeMaker 6.25

p4raw-id: //depot/perl@23653

2 files changed, 10 insertions, 8 deletions

diff --git a/lib/ExtUtils/MakeMaker/FAQ.pod b/lib/ExtUtils/MakeMaker/FAQ.pod
index a52f256283..166b1c6120 100644
--- a/lib/ExtUtils/MakeMaker/FAQ.pod
+++ b/lib/ExtUtils/MakeMaker/FAQ.pod
@@ -44,9 +44,9 @@ blib/lib and blib/arch directories.
 
 The other is to install the module in a temporary location.
 
-        perl Makefile.PL PREFIX=/tmp LIB=/tmp/lib/perl
+        perl Makefile.PL PREFIX=~/tmp LIB=~/tmp/lib/perl
 
-And then set PERL5LIB to /tmp/lib/perl.  This works well when you have
+And then set PERL5LIB to F<~/tmp/lib/perl>.  This works well when you have
 multiple modules to work with.  It also ensures that the module goes
 through its full installation process which may modify it.
 
diff --git a/lib/ExtUtils/MakeMaker/Tutorial.pod b/lib/ExtUtils/MakeMaker/Tutorial.pod
index aec12b6f0d..a4aae73eb0 100644
--- a/lib/ExtUtils/MakeMaker/Tutorial.pod
+++ b/lib/ExtUtils/MakeMaker/Tutorial.pod
@@ -1,7 +1,7 @@
 package ExtUtils::MakeMaker::Tutorial;
 
 use vars qw($VERSION);
-$VERSION = 0.01;
+$VERSION = 0.02;
 
 
 =head1 NAME
@@ -60,9 +60,9 @@ want:
 =item Makefile.PL
 
 When you run Makefile.PL, it makes a Makefile.  That's the whole point of
-MakeMaker.  The Makefile.PL is a simple module which loads
-ExtUtils::MakeMaker and runs the WriteMakefile() function with a few
-simple arguments.
+MakeMaker.  The Makefile.PL is a simple program which loads
+ExtUtils::MakeMaker and runs the WriteMakefile() function to generate a
+Makefile.
 
 Here's an example of what you need for a simple module:
 
@@ -91,18 +91,20 @@ not on Unix.
 
 You can write this by hand or generate it with 'make manifest'.
 
+See L<ExtUtils::Manifest> for more details.
+
 
 =item lib/
 
 This is the directory where your .pm and .pod files you wish to have
 installed go.  They are layed out according to namespace.  So Foo::Bar
-is lib/Foo/Bar.pm.
+is F<lib/Foo/Bar.pm>.
 
 
 =item t/
 
 Tests for your modules go here.  Each test filename ends with a .t.
-So t/foo.t.  'make test' will run these tests.  The directory is flat,
+So F<t/foo.t>/  'make test' will run these tests.  The directory is flat,
 you cannot, for example, have t/foo/bar.t run by 'make test'.
 
 Tests are run from the top level of your distribution.  So inside a test