From owner-p4-projects@FreeBSD.ORG Sat Aug 9 23:56:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B2431065671; Sat, 9 Aug 2008 23:56:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F180106566C for ; Sat, 9 Aug 2008 23:56:00 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AB4878FC0C for ; Sat, 9 Aug 2008 23:55:59 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m79NtxwM077742 for ; Sat, 9 Aug 2008 23:55:59 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m79NtxDC077740 for perforce@freebsd.org; Sat, 9 Aug 2008 23:55:59 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 9 Aug 2008 23:55:59 GMT Message-Id: <200808092355.m79NtxDC077740@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 147024 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Aug 2008 23:56:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=147024 Change 147024 by pgj@disznohal on 2008/08/09 23:55:34 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#11 integrate .. //depot/projects/docproj_hu/www/en/administration.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/cgi/man.cgi#4 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#14 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#11 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.458 2008/07/23 00:39:25 pgollucci Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.459 2008/08/09 19:21:39 sbruno Exp $ --> aaron@FreeBSD.org"> @@ -922,6 +922,8 @@ sat@FreeBSD.org"> +sbruno@FreeBSD.org"> + scf@FreeBSD.org"> schweikh@FreeBSD.org"> ==== //depot/projects/docproj_hu/www/en/administration.sgml#2 (text+ko) ==== @@ -1,5 +1,5 @@ + %developers; @@ -95,13 +95,13 @@

FreeBSD Documentation Engineering Team @@ -140,6 +140,7 @@
  • &a.linimon; <linimon@FreeBSD.org>
  • &a.pav; <pav@FreeBSD.org>
  • &a.krion; <krion@FreeBSD.org>
    • +
  • &a.flz; <flz@FreeBSD.org>
    • ==== //depot/projects/docproj_hu/www/en/cgi/man.cgi#4 (text+ko) ==== @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.217 2008/08/03 21:08:13 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.220 2008/08/07 08:30:32 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -42,8 +42,8 @@ # run `perltidy -b man.cgi' to indent the code -# Use standard FreeBSD CGI Style if available. Otherwise -# print simple HTML design. +# Use standard FreeBSD CGI Style if available. +# Otherwise print simple HTML design. package cgi_style; use constant HAS_FREEBSD_CGI_STYLE => eval { require "./cgi-style.pl"; }; @@ -381,7 +381,7 @@ 'X11R6.8.2', "$manLocalDir/X11R6.8.2", 'X11R6.9.0', "$manLocalDir/X11R6.9.0", 'X11R7.2', "$manLocalDir/X11R7.2", - 'X11R7.3.2', "$manLocalDir/X11R7.3.2", + 'X11R7.3.2', "$manLocalDir/X11R7.3.2", 'ULTRIX 4.2', "$manLocalDir/ULTRIX-4.2", 'OSF1 V4.0/alpha', "$manLocalDir/OSF1-V4.0-alpha", @@ -478,9 +478,11 @@ # mailto - Author # webmaster - who run this service -$mailto = 'wosch@FreeBSD.org'; -$mailtoURL = 'http://wolfram.schneider.org'; -$mailtoURL = "mailto:$mailto" if !$mailtoURL; +$mailto = 'wosch@FreeBSD.org'; +$mailtoURL = 'http://wolfram.schneider.org'; +$mailtoURL = "mailto:$mailto" if !$mailtoURL; +$full_url = 'http://www.freebsd.org/cgi/man.cgi'; +$want_to_link_to_this_page = 1; &secure_env; @@ -496,6 +498,12 @@ ####################################################################################### sub html_footer { + my %args = @_; + + print +qq{home | help \n} + if !$args{'no_home_link'}; + if (cgi_style::HAS_FREEBSD_CGI_STYLE) { print q{
    }; print &cgi_style::html_footer; @@ -550,14 +558,6 @@ $format = $form{'format'}; $format = 'html' if $format !~ /^(ps|pdf|ascii|latin1)$/; - local ($fform) = &dec($form); - if ( $fform =~ m%^([a-zA-Z_\-\.]+)$% ) { - return &man( $1, '' ); - } - elsif ( $fform =~ m%^([a-zA-Z_\-\.]+)\(([0-9a-zA-Z]+)\)$% ) { - return &man( $1, $2 ); - } - # remove trailing spaces for dumb users $form{'query'} =~ s/\s+$//; $form{'query'} =~ s/^\s+//; @@ -588,6 +588,14 @@ } } + local ($fform) = &dec($form); + if ( $fform =~ m%^([a-zA-Z_\-\.:]+)$% ) { + return &man( $1, '' ); + } + elsif ( $fform =~ m%^([a-zA-Z_\-\.:]+)\(([0-9a-zA-Z]+)\)$% ) { + return &man( $1, $2 ); + } + # download a man hierarchie as gzip'd tar file return &download if ( $apropos > 1 ); @@ -702,11 +710,11 @@ &formquery; local ($mpath) = $manPath{$manpath}; - if ($debug >= 2) { - foreach my $dir (split(/:/, $mpath)) { - my $whatis = $dir . '/whatis'; - warn "$manpath: no whatis file found: $whatis\n" if ! -f $whatis; - } + if ( $debug >= 2 ) { + foreach my $dir ( split( /:/, $mpath ) ) { + my $whatis = $dir . '/whatis'; + warn "$manpath: no whatis file found: $whatis\n" if !-f $whatis; + } } open( APROPOS, "env MANPATH=$mpath $command{'man'} -k . |" ) || do { @@ -751,8 +759,7 @@ my %args = @_; my $name = exists $args{'name'} ? $args{'name'} : 'manpage'; - my $section = - exists $args{'section'} + my $section = exists $args{'section'} && $args{'section'} ne "" ? $args{'section'} : '0'; my $format = exists $args{'format'} ? $args{'format'} : 'unkown'; @@ -1009,7 +1016,7 @@ print; } close(MAN); - print qq{\n\n
    \n}; + print qq{\n    \n
    \n}; for ( $i = 0 ; $i <= $#sect ; $i++ ) { $j = &encode_url( $sect[$i] ); @@ -1020,6 +1027,15 @@ . ( $i < $#sect ? " |\n" : "\n" ); } + if ($want_to_link_to_this_page) { + my $url = qq{$full_url?query=$html_name}; + $url .= qq{&sektion=$html_section} if $html_section != 0; + $url .= qq{&manpath=} . &encode_url($manpath); + + print qq{

    Want to link to this manual page? }; + print qq{Use this URL:
    <    $url>

    \n}; + } + &html_footer; # Sleep 0.35 seconds to avoid DoS attacs @@ -1222,7 +1238,7 @@ ETX print "
    \n"; - &html_footer; + &html_footer( 'no_home_link' => 1 ); } sub formquery { @@ -1315,7 +1331,7 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.217 2008/08/03 21:08:13 wosch Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.220 2008/08/07 08:30:32 wosch Exp $'; return qq{\ 
     Copyright (c) 1996-2008 Wolfram Schneider
@@ -1336,12 +1352,13 @@
 HP,
 FreeBSD,
 Minix,
-Linux Slackware,
-Linux/de,
 NetBSD,
 OpenBSD,
 Plan 9,
+Red Hat,
+Slackware Linux,
 SunOS,
+SuSE,
 ULTRIX,
 Unix Seventh Edition,
 XFree86,
@@ -1363,6 +1380,14 @@
 OS vendors
 
 
+
    Shortcuts for FreeBSD manual pages
    
+
+
+
+
 
    Releases
    
 
 Releases and Releases Aliases are information how 
@@ -1406,11 +1431,7 @@
 
     &http_header("text/html");
     print &html_header( "FreeBSD manual page help", $base ) . "
    ",
-      $www{'head'}, "
    \n" . &faq . qq{\
-
    
-
-home
-};
+      $www{'head'}, "

    \n" . &faq . qq{
    \n}; &html_footer; } ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#14 (text+ko) ==== @@ -20,7 +20,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.185 2008/07/31 16:01:39 simon Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.186 2008/08/06 19:59:21 pgj Exp $ @@ -28,6 +28,20 @@ 2008 + 8 + + + 6 + + +

    Enhanced commit privileges: Gábor Páli + (full doc/www)

    +     +     +     + + 7