Skip to content

Commit

Permalink
Point manpages to man7.org (HTTPS)
Browse files Browse the repository at this point in the history
Instead of HTTP-only man.he.net

Avoiding "Not secure" warnings thereby

Fixes perl-pod#150
  • Loading branch information
rwp0 committed Jul 28, 2024
1 parent a2eaba2 commit e5f1a34
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 27 deletions.
13 changes: 4 additions & 9 deletions lib/Pod/Simple/HTML.pm
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ $Perldoc_URL_Postfix = ''
unless defined $Perldoc_URL_Postfix;


our $Man_URL_Prefix = 'http://man.he.net/man';
our $Man_URL_Postfix = '';
our $Man_URL_Prefix = 'https://man7.org/linux/man-pages/man';
our $Man_URL_Postfix = '.html';

our $Title_Prefix;
$Title_Prefix = '' unless defined $Title_Prefix;
Expand All @@ -59,7 +59,7 @@ __PACKAGE__->_accessorize(
# In turning L<crontab(5)> into http://whatever/man/1/crontab, what
# to put before the "1/crontab".
'man_url_postfix',
# what to put after the "1/crontab" in the URL. Normally "".
# what to put after the "1/crontab" in the URL. Normally ".html".

'batch_mode', # whether we're in batch mode
'batch_mode_current_level',
Expand Down Expand Up @@ -797,7 +797,7 @@ sub resolve_man_page_link {
$section ||= 1;

return $self->man_url_prefix . "$section/"
. $self->manpage_url_escape($page)
. $self->manpage_url_escape($page) . ".$section"
. $self->man_url_postfix;
}

Expand Down Expand Up @@ -1136,11 +1136,6 @@ This program is distributed in the hope that it will be useful, but
without any warranty; without even the implied warranty of
merchantability or fitness for a particular purpose.
=head1 ACKNOWLEDGEMENTS
Thanks to L<Hurricane Electric|http://he.net/> for permission to use its
L<Linux man pages online|http://man.he.net/> site for man page links.
=head1 AUTHOR
Pod::Simple was created by Sean M. Burke <[email protected]>.
Expand Down
20 changes: 7 additions & 13 deletions lib/Pod/Simple/XHTML.pm
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,12 @@ default.
In turning C<< L<crontab(5)> >> into http://whatever/man/1/crontab, what
to put before the "1/crontab". The default value is
"http://man.he.net/man".
"https://man7.org/linux/man-pages/man".
=head2 man_url_postfix
What to put after "1/crontab" in the URL. This option is not set by default.
What to put after "1/crontab" in the URL.
This option is set to ".html" by default.
=head2 title_prefix, title_postfix
Expand Down Expand Up @@ -276,7 +277,7 @@ sub new {
my $new = $self->SUPER::new(@_);
$new->{'output_fh'} ||= *STDOUT{IO};
$new->perldoc_url_prefix('https://metacpan.org/pod/');
$new->man_url_prefix('http://man.he.net/man');
$new->man_url_prefix('https://man7.org/linux/man-pages/man');
$new->html_charset('ISO-8859-1');
$new->nix_X_codes(1);
$new->{'scratch'} = '';
Expand Down Expand Up @@ -774,14 +775,12 @@ sub resolve_pod_page_link {
Resolves a man page link target and numeric section to a URL. The resulting
link will be returned for the above examples as:
http://man.he.net/man5/crontab
http://man.he.net/man1/crontab
https://man7.org/linux/man-pages/man5/crontab.5.html
https://man7.org/linux/man-pages/man1/crontab.1.html
Note that the first argument is required. The section number will be parsed
from it, and if it's missing will default to 1. The second argument is
currently ignored, as L<man.he.net|http://man.he.net> does not currently
include linkable IDs or anchor names in its pages. Subclass to link to a
different man page HTTP server.
currently ignored. Subclass to link to a different man page HTTP server.
=cut

Expand Down Expand Up @@ -905,11 +904,6 @@ This program is distributed in the hope that it will be useful, but
without any warranty; without even the implied warranty of
merchantability or fitness for a particular purpose.
=head1 ACKNOWLEDGEMENTS
Thanks to L<Hurricane Electric|http://he.net/> for permission to use its
L<Linux man pages online|http://man.he.net/> site for man page links.
=head1 AUTHOR
Pod::Simple::XHTML was created by Allison Randal <[email protected]>.
Expand Down
9 changes: 5 additions & 4 deletions t/fcodes_s.t
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,8 @@ is(
# Test HTML output of links.
use Pod::Simple::HTML;
my $PERLDOC = "https://metacpan.org/pod";
my $MANURL = "http://man.he.net/man";
my $MANURL = "https://man7.org/linux/man-pages/man";
my $MANURL_POSTFIX = ".html";
sub x {
Pod::Simple::HTML->_out(
sub { $_[0]->bare_output(1) },
Expand All @@ -240,7 +241,7 @@ is(

is(
x(qq{L<crontab(5)>\n}),
qq{\n<p><a href="${MANURL}5/crontab" class="podlinkman"\n>crontab(5)</a></p>\n}
qq{\n<p><a href="${MANURL}5/crontab${MANURL_POSTFIX}" class="podlinkman"\n>crontab(5)</a></p>\n}
);

is(
Expand Down Expand Up @@ -300,12 +301,12 @@ is(

is(
x(qq{L<things|crontab(5)>\n}),
qq{\n<p><a href="${MANURL}5/crontab" class="podlinkman"\n>things</a></p>\n}
qq{\n<p><a href="${MANURL}5/crontab${MANURL_POSTFIX}" class="podlinkman"\n>things</a></p>\n}
);

is(
x(qq{L<things|crontab(5)/ENVIRONMENT>\n}),
qq{\n<p><a href="${MANURL}5/crontab" class="podlinkman"\n>things</a></p>\n}
qq{\n<p><a href="${MANURL}5/crontab${MANURL_POSTFIX}" class="podlinkman"\n>things</a></p>\n}
);

is(
Expand Down
2 changes: 1 addition & 1 deletion t/xhtml01.t
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ isa_ok ($parser, 'Pod::Simple::XHTML');
my $results;

my $PERLDOC = "https://metacpan.org/pod";
my $MANURL = "http://man.he.net/man";
my $MANURL = "https://man7.org/linux/man-pages/man";

initialize($parser, $results);
$parser->parse_string_document( "=head1 Poit!" );
Expand Down

0 comments on commit e5f1a34

Please sign in to comment.