diff --git a/en/cgi/man.cgi b/en/cgi/man.cgi index 033a673051..9e1b79a71a 100755 --- a/en/cgi/man.cgi +++ b/en/cgi/man.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -T # -# Copyright (c) 1996-2004 Wolfram Schneider +# Copyright (c) 1996-2007 Wolfram Schneider # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -33,16 +33,16 @@ # BSDI Id: bsdi-man,v 1.2 1995/01/11 02:30:01 polk Exp # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # -# $Id: man.cgi,v 1.168 2007-01-27 21:37:10 simon Exp $ +# $Id: man.cgi,v 1.169 2007-02-11 11:39:20 wosch Exp $ -#use Data::Dumper; -#use Carp; +############################################################################ +# !!! man.cgi is stale perl4 code !!! +############################################################################ $www{'title'} = 'FreeBSD Hypertext Man Pages'; $www{'home'} = 'http://www.FreeBSD.org'; -$www{'head'} = qq[$www{'title'} ] . - qq[] . +$www{'head'} = $www{'title'}; ""; $command{'man'} = 'man'; # 8Bit clean man @@ -436,8 +436,8 @@ sub do_man { local($u) = 'http://user.cs.tu-berlin.de/~wosch/man.cgi'; local($u)= $BASE; - return &faq_output($u) if ($path =~ /faq.html$/); - return ©right_output($u) if ($path =~ /copyright.html$/); + return &faq_output($u) if ($path =~ /\/(faq|help)\.html$/); + #return ©right_output($u) if ($path =~ /copyright.html$/); return &get_the_sources if ($path =~ /source$/); return &include_output($path) @@ -986,16 +986,19 @@ sub indexpage { local($m) = ($manpath ? $manpath : $manPathDefault); $m = &encode_url($m); - print "Section Indexes: "; + print "Section Indexes:\n"; foreach ('1', '2', '3', '4', '5', '6', '7', '8', '9', 'n') { - print qq{¤ $_\n}; + print qq{¤ } if $_ ne '1'; + print qq{$_\n}; } - print "
Explanations of Man Sections:"; + print "
Explanations of Man Sections:\n"; foreach ('1', '2', '3', '4', '5', '6', '7', '8', '9') { - print qq{¤ intro($_)\n}; + print qq{¤ } if $_ ne '1'; + print qq{intro($_)\n}; } + if (0) { print "
\nQuick Reference Categories:\n"; foreach ('database', 'disk', 'driver', 'ethernet', 'mail', 'net', 'nfs', 'nis', 'protocol', 'ppp', 'roff', 'string', 'scsi', @@ -1003,12 +1006,11 @@ sub indexpage { { print qq{¤ $_\n}; } + } + print < - -Please direct questions about this server to -$webmaster
URL: $www{'home'}$BASE
ETX @@ -1071,20 +1073,19 @@ ETX Output format -Index Page and Help | -FAQ | -Copyright +home | +help
ETX 0; } sub copyright { - $id = '$Id: man.cgi,v 1.168 2007-01-27 21:37:10 simon Exp $'; + $id = '$Id: man.cgi,v 1.169 2007-02-11 11:39:20 wosch Exp $'; return qq{\ 
-Copyright (c) 1996-2004 Wolfram Schneider <$mailto>
+Copyright (c) 1996-2007 Wolfram Schneider
 Copyright (c) 1993-1995 Berkeley Software Design, Inc.
 
 This data is part of a licensed program from BERKELEY SOFTWARE
@@ -1096,7 +1097,7 @@ Technology, Free Software Foundation, FreeBSD Inc., and others.
 This script has the revsion: $id
 

 
-Copyright (c) for man pages by OS vendors.
+Copyright (©) for man pages by OS vendors.
 

 2.11 BSD,
 HP,
@@ -1132,10 +1133,37 @@ sub faq {
 	     &encode_url($_) . "\n") if $manPathAliases{$_};
     }
 
+    local $id = '$Id: man.cgi,v 1.169 2007-02-11 11:39:20 wosch Exp $';
     return qq{\
 
-Copyright (c) 1996-2004 Wolfram Schneider <$mailto>
-

+Copyright (c) 1996-2007 Wolfram Schneider
+Copyright (c) 1993-1995 Berkeley Software Design, Inc.
+
+This data is part of a licensed program from BERKELEY SOFTWARE
+DESIGN, INC.  Portions are copyrighted by BSDI, The Regents of
+the University of California, Massachusetts Institute of
+Technology, Free Software Foundation, FreeBSD Inc., and others.
+
+
\n +This script has the revsion: $id +

+ +Copyright (c) for man pages by OS vendors. +

+2.11 BSD, +HP, +FreeBSD, +Minix, +Linux Slackware, +Linux/de, +NetBSD, +OpenBSD, +Plan 9, +SunOS, +ULTRIX, +Unix Seventh Edition, +XFree86, +X11R6

FAQ

    @@ -1150,8 +1178,8 @@ and troff output. Unix family tree, BSD part.
  • The FreeBSD Ports Changes script. -
  • Copyright (c) and download for man pages by -OS vendors +
  • Copyright (c) and download for man pages by +OS vendors

Releases

@@ -1186,8 +1214,7 @@ the query dialog. There are also several hypertext links provided as short-cuts to various queries: Section Indexes is apropos listings of all man pages by section. Explanations of Man Sections contains pointers to the intro pages for various man -sections. Or you can select a category from Quick Reference -Categories and see man pages relevant to the selected topic. +sections.

}; } @@ -1198,7 +1225,7 @@ sub copyright_output { "

$www{'head'}

\n" . ©right . qq{\
-Index Page and Help +home }; @@ -1210,7 +1237,7 @@ sub faq_output { "

$www{'head'}

\n" . &faq . qq{\
-Index Page and Help +home }; @@ -1262,7 +1289,7 @@ sub mydie { print qq{

-Index Page and Help +home };