summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Pod/Man.pm8
-rw-r--r--lib/Pod/Text.pm10
-rw-r--r--utils/perldoc.PL2
3 files changed, 14 insertions, 6 deletions
diff --git a/lib/Pod/Man.pm b/lib/Pod/Man.pm
index 2c61a9b233..31036826b9 100644
--- a/lib/Pod/Man.pm
+++ b/lib/Pod/Man.pm
@@ -1,5 +1,5 @@
# Pod::Man -- Convert POD data to formatted *roff input.
-# $Id: Man.pm,v 1.14 2001/01/16 13:39:45 eagle Exp $
+# $Id: Man.pm,v 1.15 2001/02/10 06:50:22 eagle Exp $
#
# Copyright 1999, 2000, 2001 by Russ Allbery <rra@stanford.edu>
#
@@ -38,7 +38,7 @@ use vars qw(@ISA %ESCAPES $PREAMBLE $VERSION);
# Perl core and too many things could munge CVS magic revision strings.
# This number should ideally be the same as the CVS revision in podlators,
# however.
-$VERSION = 1.14;
+$VERSION = 1.15;
############################################################################
@@ -806,6 +806,10 @@ sub buildlink {
s/^\s+//;
s/\s+$//;
+ # If the argument looks like a URL, return it verbatim. This only
+ # handles URLs that use the server syntax.
+ if (m%^[a-z]+://\S+$%) { return $_ }
+
# Default to using the whole content of the link entry as a section
# name. Note that L<manpage/> forces a manpage interpretation, as does
# something looking like L<manpage(section)>. Do the same thing to
diff --git a/lib/Pod/Text.pm b/lib/Pod/Text.pm
index 5f2dae049a..9936025101 100644
--- a/lib/Pod/Text.pm
+++ b/lib/Pod/Text.pm
@@ -1,7 +1,7 @@
# Pod::Text -- Convert POD data to formatted ASCII text.
-# $Id: Text.pm,v 2.7 2000/11/19 04:47:50 eagle Exp $
+# $Id: Text.pm,v 2.8 2001/02/10 06:50:23 eagle Exp $
#
-# Copyright 1999, 2000 by Russ Allbery <rra@stanford.edu>
+# Copyright 1999, 2000, 2001 by Russ Allbery <rra@stanford.edu>
#
# This program is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
@@ -37,7 +37,7 @@ use vars qw(@ISA @EXPORT %ESCAPES $VERSION);
# Perl core and too many things could munge CVS magic revision strings.
# This number should ideally be the same as the CVS revision in podlators,
# however.
-$VERSION = 2.07;
+$VERSION = 2.08;
############################################################################
@@ -492,6 +492,10 @@ sub seq_l {
s/^\s+//;
s/\s+$//;
+ # If the argument looks like a URL, return it verbatim. This only
+ # handles URLs that use the server syntax.
+ if (m%^[a-z]+://\S+$%) { return $_ }
+
# Default to using the whole content of the link entry as a section
# name. Note that L<manpage/> forces a manpage interpretation, as does
# something looking like L<manpage(section)>. The latter is an
diff --git a/utils/perldoc.PL b/utils/perldoc.PL
index be2435f745..ca631dda2b 100644
--- a/utils/perldoc.PL
+++ b/utils/perldoc.PL
@@ -38,7 +38,7 @@ INIT { eval { umask(0077) } } # doubtless someone has no mask
my \@pagers = ();
push \@pagers, "$Config{'pager'}" if -x "$Config{'pager'}";
-my \$bindir = "$Config{installscript}";
+my \$bindir = '$Config{scriptdir}';
!GROK!THIS!