8 files changed, 31 insertions, 63 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 39305fe075..77b3e0a8a8 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -749,7 +749,7 @@ use File::Glob qw(:case);
 
     'perlfaq' => {
         'MAINTAINER'   => 'perlfaq',
-        'DISTRIBUTION' => 'LLAP/perlfaq-5.0150038.tar.gz',
+        'DISTRIBUTION' => 'LLAP/perlfaq-5.0150039.tar.gz',
         'FILES'        => q[cpan/perlfaq],
         'EXCLUDED'     => [
             qw( t/release-pod-syntax.t
diff --git a/cpan/perlfaq/lib/perlfaq.pm b/cpan/perlfaq/lib/perlfaq.pm
index 9947fdb428..1d5b4e4233 100644
--- a/cpan/perlfaq/lib/perlfaq.pm
+++ b/cpan/perlfaq/lib/perlfaq.pm
@@ -1,6 +1,6 @@
 package perlfaq;
 {
-  $perlfaq::VERSION = '5.0150038';
+  $perlfaq::VERSION = '5.0150039';
 }
 
 0; # not is it supposed to be loaded
diff --git a/cpan/perlfaq/lib/perlfaq.pod b/cpan/perlfaq/lib/perlfaq.pod
index dfc2719b51..449c0a2de8 100644
--- a/cpan/perlfaq/lib/perlfaq.pod
+++ b/cpan/perlfaq/lib/perlfaq.pod
@@ -231,10 +231,6 @@ Is there a pretty-printer (formatter) for Perl?
 
 =item *
 
-Is there a ctags for Perl?
-
-=item *
-
 Is there an IDE or Windows Perl Editor?
 
 =item *
@@ -721,10 +717,6 @@ Why do I sometimes get an "Argument list too long" when I use E<lt>*E<gt>?
 
 =item *
 
-Is there a leak/bug in glob()?
-
-=item *
-
 How can I open a file with a leading "E<gt>" or trailing blanks?
 
 =item *
diff --git a/cpan/perlfaq/lib/perlfaq3.pod b/cpan/perlfaq/lib/perlfaq3.pod
index 0eef818f28..9e9ae8d906 100644
--- a/cpan/perlfaq/lib/perlfaq3.pod
+++ b/cpan/perlfaq/lib/perlfaq3.pod
@@ -338,18 +338,6 @@ for indenting, ^D is for undenting, and ^O is for blockdenting--as
 it were. A more complete example, with comments, can be found at
 L<http://www.cpan.org/authors/id/TOMC/scripts/toms.exrc.gz>
 
-=head2 Is there a ctags for Perl?
-
-(contributed by brian d foy)
-
-Ctags uses an index to quickly find things in source code, and many
-popular editors support ctags for several different languages,
-including Perl.
-
-Exuberant ctags supports Perl: L<http://ctags.sourceforge.net/>
-
-You might also try pltags: L<http://www.mscha.com/pltags.zip>
-
 =head2 Is there an IDE or Windows Perl Editor?
 
 Perl programs are just plain text, so any editor will do.
@@ -410,7 +398,8 @@ debugger and syntax-highlighting editor.
 L<http://padre.perlide.org/>
 
 Padre is cross-platform IDE for Perl written in Perl using wxWidgets to provide
-a native look and feel. It's open source under the Artistic License.
+a native look and feel. It's open source under the Artistic License. It
+is one of the newer Perl IDEs.
 
 =item PerlBuilder
 
diff --git a/cpan/perlfaq/lib/perlfaq5.pod b/cpan/perlfaq/lib/perlfaq5.pod
index 751ee46aed..60bd08306d 100644
--- a/cpan/perlfaq/lib/perlfaq5.pod
+++ b/cpan/perlfaq/lib/perlfaq5.pod
@@ -244,11 +244,7 @@ first, then print the line that you want to add.
 
 To delete lines, only print the ones that you want.
 
-    perl -ni -e 'print unless /d/' inFile.txt
-
-        ... or ...
-
-    perl -pi -e 'next unless /d/' inFile.txt
+    perl -ni -e 'print if /d/' inFile.txt
 
 =head2 How do I count the number of lines in a file?
 X<file, counting lines> X<lines> X<line>
@@ -848,15 +844,6 @@ To get around this, either upgrade to Perl v5.6.0 or later, do the glob
 yourself with readdir() and patterns, or use a module like L<File::Glob>,
 one that doesn't use the shell to do globbing.
 
-=head2 Is there a leak/bug in glob()?
-X<glob>
-
-(contributed by brian d foy)
-
-Starting with Perl 5.6.0, C<glob> is implemented internally rather
-than relying on an external resource. As such, memory issues with
-C<glob> aren't a problem in modern perls.
-
 =head2 How can I open a file with a leading ">" or trailing blanks?
 X<filename, special characters>
 
diff --git a/cpan/perlfaq/lib/perlfaq7.pod b/cpan/perlfaq/lib/perlfaq7.pod
index 20922f375b..35c9330f2d 100644
--- a/cpan/perlfaq/lib/perlfaq7.pod
+++ b/cpan/perlfaq/lib/perlfaq7.pod
@@ -178,38 +178,30 @@ If you're looking for something a bit more rigorous, try L<perltoot>.
 
 =head2 How do I create a module?
 
-(contributed by brian d foy)
-
-L<perlmod>, L<perlmodlib>, L<perlmodstyle> explain modules
-in all the gory details. L<perlnewmod> gives a brief
-overview of the process along with a couple of suggestions
-about style.
+L<perlnewmod> is a good place to start, ignore the bits
+about uploading to CPAN if you don't want to make your
+module publicly available.
 
-If you need to include C code or C library interfaces in
-your module, you'll need h2xs. h2xs will create the module
-distribution structure and the initial interface files
-you'll need. L<perlxs> and L<perlxstut> explain the details.
+L<ExtUtils::ModuleMaker> and L<Module::Starter> are also
+good places to start. Many CPAN authors now use L<Dist::Zilla>
+to automate as much as possible.
 
-If you don't need to use C code, other tools such as
-ExtUtils::ModuleMaker and Module::Starter, can help you
-create a skeleton module distribution.
+Detailed documentation about modules can be found at:
+L<perlmod>, L<perlmodlib>, L<perlmodstyle>.
 
-You may also want to see Sam Tregar's "Writing Perl Modules
-for CPAN" ( L<http://apress.com/book/bookDisplay.html?bID=14> )
-which is the best hands-on guide to creating module
-distributions.
+If you need to include C code or C library interfaces 
+use h2xs. h2xs will create the module distribution structure 
+and the initial interface files.
+L<perlxs> and L<perlxstut> explain the details.
 
 =head2 How do I adopt or take over a module already on CPAN?
 
-(contributed by brian d foy)
-
-The easiest way to take over a module is to have the current
-module maintainer either make you a co-maintainer or transfer
-the module to you.
+Ask the current maintainer to make you a co-maintainer or
+transfer the module to you.
 
-If you can't reach the author for some reason (e.g. email bounces),
-the PAUSE admins at modules@perl.org can help. The PAUSE admins
-treat each case individually.
+If you can not reach the author for some reason contact
+the PAUSE admins at modules@perl.org who may be able to help,
+but each case it treated seperatly.
 
 =over 4
 
diff --git a/cpan/perlfaq/lib/perlfaq9.pod b/cpan/perlfaq/lib/perlfaq9.pod
index f00acca019..b42755efe0 100644
--- a/cpan/perlfaq/lib/perlfaq9.pod
+++ b/cpan/perlfaq/lib/perlfaq9.pod
@@ -293,7 +293,11 @@ Use the L<Email::MIME> and L<Email::Sender::Simple> modules, like so:
       To      => 'friend@example.com',
       Subject => 'Happy birthday!',
     ],
-    body_str => 'Happy birthday to you!',
+    attributes => {
+      encoding => 'quoted-printable',
+      charset  => 'ISO-8859-1',
+    },
+    body_str => "Happy birthday to you!\n",
   );
 
   use Email::Sender::Simple qw(sendmail);
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 8db7170022..8d545d031e 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -389,6 +389,10 @@ L<Parse::CPAN::Meta> has been upgraded from version 1.4401 to version 1.4402.
 
 =item *
 
+L<perlfaq> has been upgraded from version 5.0150038 to version 5.0150039.
+
+=item *
+
 L<Pod::Functions> has been upgraded from version 1.04 to version 1.05.
 
 F<Functions.pm> is now generated at perl build time from annotations in