Date: Sat, 9 Aug 2008 23:55:59 GMT From: Gabor Pali <pgj@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 147024 for review Message-ID: <200808092355.m79NtxDC077740@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 $ --> <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>"> @@ -922,6 +922,8 @@ <!ENTITY a.sat "Andrew Pantyukhin <email>sat@FreeBSD.org</email>"> +<!ENTITY a.sbruno "Sean Bruno <email>sbruno@FreeBSD.org</email>"> + <!ENTITY a.scf "Sean C. Farley <email>scf@FreeBSD.org</email>"> <!ENTITY a.schweikh "Jens Schweikhardt <email>schweikh@FreeBSD.org</email>"> ==== //depot/projects/docproj_hu/www/en/administration.sgml#2 (text+ko) ==== @@ -1,5 +1,5 @@ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ -<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.16 2008/02/18 16:42:46 remko Exp $"> +<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.18 2008/08/09 16:56:31 joel Exp $"> <!ENTITY title "FreeBSD Project Administration and Management"> <!ENTITY % navinclude.about "INCLUDE"> <!ENTITY % developers SYSTEM "developers.sgml"> %developers; @@ -95,13 +95,13 @@ <ul> <li>&a.wilko; <<a href="mailto:wilko@FreeBSD.org">wilko@FreeBSD.org</a>></li> <li>&a.brooks; <<a href="mailto:brooks@FreeBSD.org">brooks@FreeBSD.org</a>></li> + <li>&a.kris; <<a href="mailto:kris@FreeBSD.org">kris@FreeBSD.org</a>></li> <li>&a.keramida; <<a href="mailto:keramida@FreeBSD.org">keramida@FreeBSD.org</a>></li> - <li>&a.imp; <<a href="mailto:imp@FreeBSD.org">imp@FreeBSD.org</a>></li> <li>&a.gnn; <<a href="mailto:gnn@FreeBSD.org">gnn@FreeBSD.org</a>></li> - <li>&a.wes; <<a href="mailto:wes@FreeBSD.org">wes@FreeBSD.org</a>></li> <li>&a.hrs; <<a href="mailto:hrs@FreeBSD.org">hrs@FreeBSD.org</a>></li> <li>&a.murray; <<a href="mailto:murray@FreeBSD.org">murray@FreeBSD.org</a>></li> <li>&a.rwatson; <<a href="mailto:rwatson@FreeBSD.org">rwatson@FreeBSD.org</a>></li> + <li>&a.peter; <<a href="mailto:peter@FreeBSD.org">peter@FreeBSD.org</a>></li> </ul> <h3><a name="t-doceng">FreeBSD Documentation Engineering Team</a> @@ -140,6 +140,7 @@ <li>&a.linimon; <<a href="mailto:linimon@FreeBSD.org">linimon@FreeBSD.org</a>></li> <li>&a.pav; <<a href="mailto:pav@FreeBSD.org">pav@FreeBSD.org</a>></li> <li>&a.krion; <<a href="mailto:krion@FreeBSD.org">krion@FreeBSD.org</a>></li> + <li>&a.flz; <<a href="mailto:flz@FreeBSD.org">flz@FreeBSD.org</a>></li> </ul> <hr> ==== //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{<a href="$BASE?manpath=$m">home</a> | <a href="$BASE/help.html">help</a> \n} + if !$args{'no_home_link'}; + if (cgi_style::HAS_FREEBSD_CGI_STYLE) { print q{<hr noshade="noshade" />}; 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{</pre>\n<a name="end" />\n<hr noshade="noshade" />\n}; + print qq{</pre>\n<a name="end" />\n<hr />\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{<p align="left">Want to link to this manual page? }; + print qq{Use this URL:<br/><<a href="$url">$url</a>></p>\n}; + } + &html_footer; # Sleep 0.35 seconds to avoid DoS attacs @@ -1222,7 +1238,7 @@ ETX print "<br />\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{\ <pre> Copyright (c) 1996-2008 <a href="$mailtoURL">Wolfram Schneider</a> @@ -1336,12 +1352,13 @@ <a href="http://www.hp.com">HP</a>, <a href="http://www.freebsd.org">FreeBSD</a>, <a href="http://www.cs.vu.nl/~ast/minix.html">Minix</a>, -<a href="http://slackware.com">Linux Slackware</a>, -<a href="http://www.linux.de">Linux/de</a>, <a href="http://www.netbsd.org">NetBSD</a>, <a href="http://www.openbsd.org">OpenBSD</a>, <a href="http://plan9.bell-labs.com/plan9/">Plan 9</a>, +<a href="http://www.redhat.com">Red Hat</a>, +<a href="http://slackware.com">Slackware Linux</a>, <a href="http://www.sun.com">SunOS</a>, +<a href="http://www.suse.com">SuSE</a>, <a href="http://www.digital.com">ULTRIX</a>, <a href="ftp://elib.zib.de/pub/netlib/att/cs/v7man">Unix Seventh Edition</a>, <a href="http://www.xfree86.org">XFree86</a>, @@ -1363,6 +1380,14 @@ OS vendors</li> </ul> +<h2>Shortcuts for FreeBSD manual pages</h2> + +<ul> +<li>which manpage: <a href="$BASE?which">$full_url?which</a></li> +<li>socket(2) manpage: <a href="$BASE?socket(2)">$full_url?socket(2)</a></li> +</ul> + + <h2>Releases</h2> Releases and Releases Aliases are information how @@ -1406,11 +1431,7 @@ &http_header("text/html"); print &html_header( "FreeBSD manual page help", $base ) . "<h1>", - $www{'head'}, "</h1>\n" . &faq . qq{\ -<hr /> - -<a href="$_[0]">home</a> -}; + $www{'head'}, "</h1>\n" . &faq . qq{<br />\n}; &html_footer; } ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#14 (text+ko) ==== @@ -20,7 +20,7 @@ <news> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $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 $ </cvs:keyword> </cvs:keywords> @@ -28,6 +28,20 @@ <name>2008</name> <month> + <name>8</name> + + <day> + <name>6</name> + + <event> + <p>Enhanced commit privileges: <a + href="mailto:pgj@FreeBSD.org">Gábor Páli</a> + (full doc/www)</p> + </event> + </day> + </month> + + <month> <name>7</name> <day>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808092355.m79NtxDC077740>