summaryrefslogtreecommitdiff
path: root/cpan/Pod-Perldoc
diff options
context:
space:
mode:
authorChris 'BinGOs' Williams <chris@bingosnet.co.uk>2013-01-28 11:15:47 +0000
committerChris 'BinGOs' Williams <chris@bingosnet.co.uk>2013-01-28 11:15:47 +0000
commitc33238e5457be5460fa8a8dd4d900acfaf786190 (patch)
tree552edbf2b0613e2a824cd32d9c1869f77efe693e /cpan/Pod-Perldoc
parenta7cd2d385922346d1a3c4ac56230544bb7f00ef9 (diff)
downloadperl-c33238e5457be5460fa8a8dd4d900acfaf786190.tar.gz
Update Pod-Perldoc to CPAN version 3.19
[DELTA] 3.19 - Mon Jan 28 04:29:40 UTC 2013 * Really put perldoc.pod into man1 3.18 - Mon Jan 28 04:17:26 UTC 2013 * Document perldoc behavior in build directories (RT #80376) * Don't blindly force UTF8 to Pod::Man (RT #77465) * Fix is_dos typo (RT #76029) * Put perldoc.pod into man1 RT #77210 (ppisar@redhat.com) * Remove formatting from literal blocks RT #77209 (ppisar@redhat.com)
Diffstat (limited to 'cpan/Pod-Perldoc')
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc.pm8
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm13
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm2
-rw-r--r--cpan/Pod-Perldoc/lib/perldoc.pod43
14 files changed, 49 insertions, 37 deletions
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
index a0dd24addc..8c841e833e 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc.pm
@@ -12,7 +12,7 @@ use File::Spec::Functions qw(catfile catdir splitdir);
use vars qw($VERSION @Pagers $Bindir $Pod2man
$Temp_Files_Created $Temp_File_Lifetime
);
-$VERSION = '3.17';
+$VERSION = '3.19';
#..........................................................................
@@ -798,7 +798,7 @@ sub options_sanity {
if( $self->opt_f or $self->opt_q ) {
$self->usage("Only one of -f -or -q") if $self->opt_f and $self->opt_q;
$self->warn(
- "Perldoc is only really meant for reading one word at a time.\n",
+ "Perldoc is meant for reading one file at a time.\n",
"So these parameters are being ignored: ",
join(' ', @{$self->{'args'}}),
"\n" )
@@ -1423,7 +1423,7 @@ sub minus_f_nocase { # i.e., do like -f, but without regard to case
if(!$self->opt_i
or $self->is_vms or $self->is_mswin32
- or $self->Is_dos or $self->is_os2
+ or $self->is_dos or $self->is_os2
) {
# On a case-forgiving file system, or if case is important,
# that is it, all we can do.
@@ -1514,7 +1514,7 @@ sub pagers_guessing {
}
}
- unshift @pagers, $ENV{PERLDOC_PAGER} if $ENV{PERLDOC_PAGER};
+ unshift @pagers, "$ENV{PERLDOC_PAGER} <" if $ENV{PERLDOC_PAGER};
return;
}
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm
index aa8d84493f..5bf8a936a7 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/BaseTo.pm
@@ -3,7 +3,7 @@ use strict;
use warnings;
use vars qw($VERSION);
-$VERSION = '3.17';
+$VERSION = '3.19';
use Carp qw(croak carp);
use Config qw(%Config);
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm
index c77d546048..0355f8f3ca 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/GetOptsOO.pm
@@ -2,7 +2,7 @@ package Pod::Perldoc::GetOptsOO;
use strict;
use vars qw($VERSION);
-$VERSION = '3.17';
+$VERSION = '3.19';
BEGIN { # Make a DEBUG constant ASAP
*DEBUG = defined( &Pod::Perldoc::DEBUG )
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm
index 7be62e2358..c6534bd4cf 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToANSI.pm
@@ -4,7 +4,7 @@ use warnings;
use parent qw(Pod::Perldoc::BaseTo);
use vars qw($VERSION);
-$VERSION = '3.17';
+$VERSION = '3.19';
sub is_pageable { 1 }
sub write_with_binmode { 0 }
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm
index 32c309bd44..6f8d12c112 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToChecker.pm
@@ -4,7 +4,7 @@ use warnings;
use vars qw(@ISA);
use vars qw($VERSION);
-$VERSION = '3.17';
+$VERSION = '3.19';
# Pick our superclass...
#
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm
index 55616e8b89..225a78618d 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToMan.pm
@@ -5,7 +5,7 @@ use warnings;
use parent qw(Pod::Perldoc::BaseTo);
use vars qw($VERSION);
-$VERSION = '3.17';
+$VERSION = '3.19';
use File::Spec::Functions qw(catfile);
use Pod::Man 2.18;
@@ -138,7 +138,14 @@ sub _get_podman_switches {
my @switches = grep !m/^_/s, keys %$self;
- push @switches, 'utf8' => 1;
+ # There needs to be a cleaner way to handle setting
+ # the UTF-8 flag, but for now, comment out this
+ # line because it often does the wrong thing.
+ #
+ # See RT #77465
+ #
+ #push @switches, 'utf8' => 1;
+
$self->debug( "Pod::Man switches are [@switches]\n" );
return @switches;
@@ -298,7 +305,7 @@ sub _filter_through_nroff {
# Maybe someone set rendering switches as part of the opt_n value
# Deal with that here.
- my ($render, $switches) = $self->__nroffer() =~ /\A([\/a-zA-Z0-9_-]+)\b(.+)?\z/;
+ my ($render, $switches) = $self->__nroffer() =~ /\A([\/a-zA-Z0-9_\.-]+)\b(.+)?\z/;
$self->die("no nroffer!?") unless $render;
my @render_switches = $self->_collect_nroff_switches;
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm
index 2e92f2a134..4f720e7f0e 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToNroff.pm
@@ -4,7 +4,7 @@ use warnings;
use parent qw(Pod::Perldoc::BaseTo);
use vars qw($VERSION);
-$VERSION = '3.17';
+$VERSION = '3.19';
# This is unlike ToMan.pm in that it emits the raw nroff source!
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm
index 6c15c02a78..7083ae67b3 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToPod.pm
@@ -4,7 +4,7 @@ use warnings;
use parent qw(Pod::Perldoc::BaseTo);
use vars qw($VERSION);
-$VERSION = '3.17';
+$VERSION = '3.19';
sub is_pageable { 1 }
sub write_with_binmode { 0 }
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm
index a7d4739a6f..6e190f73a2 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToRtf.pm
@@ -4,7 +4,7 @@ use warnings;
use parent qw( Pod::Simple::RTF );
use vars qw($VERSION);
-$VERSION = '3.17';
+$VERSION = '3.19';
sub is_pageable { 0 }
sub write_with_binmode { 0 }
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
index dddc4c8fce..f8d9349d10 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTerm.pm
@@ -3,7 +3,7 @@ use strict;
use warnings;
use vars qw($VERSION);
-$VERSION = '3.17';
+$VERSION = '3.19';
use parent qw(Pod::Perldoc::BaseTo);
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm
index 0e4e2dacf4..530bdee7ad 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToText.pm
@@ -3,7 +3,7 @@ use strict;
use warnings;
use vars qw($VERSION);
-$VERSION = '3.17';
+$VERSION = '3.19';
use parent qw(Pod::Perldoc::BaseTo);
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm
index fb8da15c24..deed6b3ff1 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToTk.pm
@@ -3,7 +3,7 @@ use strict;
use warnings;
use vars qw($VERSION);
-$VERSION = '3.17';
+$VERSION = '3.19';
use parent qw(Pod::Perldoc::BaseTo);
diff --git a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm
index 96f35c4f4b..f85f01eb7b 100644
--- a/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm
+++ b/cpan/Pod-Perldoc/lib/Pod/Perldoc/ToXml.pm
@@ -6,7 +6,7 @@ use vars qw($VERSION);
use parent qw( Pod::Simple::XMLOutStream );
use vars qw($VERSION);
-$VERSION = '3.17';
+$VERSION = '3.19';
sub is_pageable { 0 }
sub write_with_binmode { 0 }
diff --git a/cpan/Pod-Perldoc/lib/perldoc.pod b/cpan/Pod-Perldoc/lib/perldoc.pod
index 42a9eab4cd..55febc4bf9 100644
--- a/cpan/Pod-Perldoc/lib/perldoc.pod
+++ b/cpan/Pod-Perldoc/lib/perldoc.pod
@@ -5,28 +5,28 @@ perldoc - Look up Perl documentation in Pod format.
=head1 SYNOPSIS
- B<perldoc> [B<-h>] [B<-D>] [B<-t>] [B<-u>] [B<-m>] [B<-l>] [B<-F>]
- [B<-i>] [B<-V>] [B<-T>] [B<-r>]
- [B<-dI<destination_file>>]
- [B<-oI<formatname>>]
- [B<-MI<FormatterClassName>>]
- [B<-wI<formatteroption:value>>]
- [B<-n>I<nroff-replacement>]
- [B<-X>]
- [B<-L> I<language_code>]
+ perldoc [-h] [-D] [-t] [-u] [-m] [-l] [-F]
+ [-i] [-V] [-T] [-r]
+ [-d destination_file]
+ [-o formatname]
+ [-M FormatterClassName]
+ [-w formatteroption:value]
+ [-n nroff-replacement]
+ [-X]
+ [-L language_code]
PageName|ModuleName|ProgramName|URL
Examples:
- B<perldoc> B<-f> BuiltinFunction
+ perldoc -f BuiltinFunction
- B<perldoc> B<-L> it B<-f> BuiltinFunction
+ perldoc -L it -f BuiltinFunction
- B<perldoc> B<-q> FAQ Keyword
+ perldoc -q FAQ Keyword
- B<perldoc> B<-L> fr B<-q> FAQ Keyword
+ perldoc -L fr -q FAQ Keyword
- B<perldoc> B<-v> PerlVariable
+ perldoc -v PerlVariable
See below for more description of the switches.
@@ -116,7 +116,7 @@ Examples:
=item B<-T>
This specifies that the output is not to be sent to a pager, but is to
-be sent right to STDOUT.
+be sent directly to STDOUT.
=item B<-d> I<destination-filename>
@@ -219,15 +219,14 @@ drop privileges by setting the effective and real IDs to nobody's
or nouser's account, or -2 if unavailable. If it cannot relinquish
its privileges, it will not run.
-
=head1 ENVIRONMENT
Any switches in the C<PERLDOC> environment variable will be used before the
command line arguments.
-Useful values for C<PERLDOC> include C<-oman>, C<-otext>, C<-otk>, C<-ortf>,
+Useful values for C<PERLDOC> include C<-oterm>, C<-otext>, C<-ortf>,
C<-oxml>, and so on, depending on what modules you have on hand; or
-the formatter class may be specified exactly with C<-MPod::Perldoc::ToMan>
+the formatter class may be specified exactly with C<-MPod::Perldoc::ToTerm>
or the like.
C<perldoc> also searches directories
@@ -236,6 +235,12 @@ defined) and C<PATH> environment variables.
(The latter is so that embedded pods for executables, such as
C<perldoc> itself, are available.)
+In directories where either C<Makefile.PL> or C<Build.PL> exist, C<perldoc>
+will add C<.> and C<lib> first to its search path, and as long as you're not
+the superuser will add C<blib> too. This is really helpful if you're working
+inside of a build directory and want to read through the docs even if you
+have a version of a module previously installed.
+
C<perldoc> will use, in order of preference, the pager defined in
C<PERLDOC_PAGER>, C<MANPAGER>, or C<PAGER> before trying to find a pager
on its own. (C<MANPAGER> is not used if C<perldoc> was told to display
@@ -244,7 +249,7 @@ plain text or unformatted pod.)
One useful value for C<PERLDOC_PAGER> is C<less -+C -E>.
Having PERLDOCDEBUG set to a positive integer will make perldoc emit
-even more descriptive output than the C<-v> switch does; the higher the
+even more descriptive output than the C<-D> switch does; the higher the
number, the more it emits.