Date: Mon, 10 Nov 2008 21:29:01 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 152769 for review Message-ID: <200811102129.mAALT19a037077@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=152769 Change 152769 by rene@rene_self on 2008/11/10 21:28:29 IFC (resolve a conflict in handbook/config/chapter.sgml) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#10 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/chapters.ent#7 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#7 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#9 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/flyer/flyer.tex#3 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/books.ent#3 integrate .. //depot/projects/docproj_nl/share/misc/docbook.css#2 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#4 integrate .. //depot/projects/docproj_nl/www/en/releases/6.4R/Makefile#2 integrate .. //depot/projects/docproj_nl/www/en/releases/6.4R/announce.sgml#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/errata.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/hardware-alpha.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/hardware-amd64.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/hardware-i386.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/hardware-pc98.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/hardware-powerpc.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/hardware-sparc64.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/hardware.sgml#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/installation-alpha.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/installation-amd64.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/installation-i386.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/installation-pc98.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/installation-powerpc.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/installation-sparc64.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/installation.sgml#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/readme.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/relnotes-alpha.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/relnotes-amd64.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/relnotes-i386.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/relnotes-pc98.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/relnotes-powerpc.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/relnotes-sparc64.html#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/relnotes.sgml#1 branch .. //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#8 integrate Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.12 2008/09/14 22:32:26 remko Exp $ +# $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.13 2008/11/10 20:34:00 rene Exp $ # $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.19 2006/01/03 21:17:07 siebrand Exp $ # # %SOURCE% en_US.ISO8859-1/books/handbook/Makefile ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/chapters.ent#7 (text+ko) ==== @@ -6,7 +6,7 @@ Chapters should be listed in the order in which they are referenced. - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/chapters.ent,v 1.5 2008/05/21 20:33:28 remko Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/chapters.ent,v 1.6 2008/11/10 20:37:44 rene Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/chapters.ent,v 1.3 2004/10/21 16:57:00 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/chapters.ent ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml,v 1.15 2008/09/14 22:32:27 remko Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml,v 1.16 2008/11/10 20:42:03 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/config/chapter.sgml %SRCID% 1.235 @@ -618,7 +618,8 @@ karakter <literal>#</literal> vooraf aan commentaar. Commentaar wordt gebruikt als uitleg en geheugensteun. Commentaar dient niet vermengd te worden met commando's, - anders wordt het commentaar opgevat als deel van het commando. Blanco regels worden genegeerd.</para> + anders wordt het commentaar opgevat als deel van het commando. + Blanco regels worden genegeerd.</para> </callout> <callout arearefs="co-env"> @@ -2292,7 +2293,7 @@ <literal>maxusers</literal> in afhankelijk van de hoeveelheid geheugen in het systeem, met een minimum van 32 en een maximum van 384.</para> - </footnote> + </footnote></para> <para>Als het gewenst is om deze waarde zelf aan te geven, wordt aangeraden om <literal>maxusers</literal> minstens op 4 te ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.7 2008/09/14 22:32:27 remko Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.8 2008/11/10 20:43:24 rene Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.47 2006/01/07 11:27:42 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.13 2008/09/14 22:32:27 remko Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.14 2008/11/10 20:44:25 rene Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.37 2006/08/25 16:14:06 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.15 2008/09/15 19:30:43 remko Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.16 2008/11/10 20:45:22 rene Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.46 2006/08/24 22:42:29 remko Exp $ Vertaald door: Siebrand Mazeland ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.13 2008/09/15 19:30:44 remko Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.14 2008/11/10 20:46:23 rene Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/multimedia/chapter.sgml,v 1.27 2005/12/10 23:40:57 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml#7 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The Dutch FreeBSD Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.14 2008/09/16 07:34:28 remko Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.15 2008/11/10 20:47:23 rene Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.29 2006/08/12 22:53:16 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/ports/chapter.sgml ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml#9 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml,v 1.15 2008/10/18 14:32:00 remko Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml,v 1.16 2008/11/10 20:48:13 rene Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/security/chapter.sgml,v 1.80 2006/01/05 21:13:24 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/security/chapter.sgml ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.16 2008/10/18 14:22:45 remko Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.17 2008/11/10 20:39:33 rene Exp $ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml,v 1.43 2006/08/25 12:00:28 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.sgml %SRCID% 1.190 ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/flyer/flyer.tex#3 (text+ko) ==== @@ -26,7 +26,7 @@ % OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF % SUCH DAMAGE. % -% $FreeBSD: doc/nl_NL.ISO8859-1/flyer/flyer.tex,v 1.4 2007/12/23 15:12:00 remko Exp $ +% $FreeBSD: doc/nl_NL.ISO8859-1/flyer/flyer.tex,v 1.5 2008/11/07 16:28:18 rene Exp $ % %SOURCE% en_US.ISO8859-1/flyer/flyer.tex % %SRCID% 1.16 % ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/books.ent#3 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/books.ent,v 1.1 2004/12/29 17:42:51 remko Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/books.ent,v 1.2 2008/11/10 20:36:07 rene Exp $ $FreeBSDnl: nl_NL.ISO8859-1/share/sgml/books.ent,v 1.3 2004/11/10 20:24:32 remko Exp $ %SOURCE% share/sgml/books.ent ==== //depot/projects/docproj_nl/share/misc/docbook.css#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: doc/share/misc/docbook.css,v 1.12 2007/09/02 22:52:01 chinsan Exp $ + * $FreeBSD: doc/share/misc/docbook.css,v 1.13 2008/11/09 04:24:47 chinsan Exp $ */ BODY ADDRESS { @@ -157,3 +157,53 @@ @media screen { /* hide from IE3 */ a[href]:hover { background: #ffa } } + + +BLOCKQUOTE.NOTE{ + color: #173B7F; + background: #d5e3ff; + border: 2px solid #7387b0; + padding-top: 1px; + padding-left: 5px; + padding-right: 5px; + padding-bottom: 2px; + width: 800px; +} + +BLOCKQUOTE.TIP{ + color: #004F00; + background: #c8dcc6; + border: 2px solid green; + padding: 3px; + width: 800px; + align: middle; +} + +BLOCKQUOTE.IMPORTANT{ + color:red; + font-family: arial; + font-style:italic; + font-weight:bold; + line-height: 21px; +} + +BLOCKQUOTE.WARNING{ + color: #9F1313; + background: #f8e4e4; + border: 2px solid #e59595; + padding-top: 1px; + padding-left: 5px; + padding-right: 5px; + padding-bottom: 2px; + width: 800px; +} + +.EXAMPLE{ + background: #fefde6; + border: 2px solid #f1bb16; + padding-top: 1px; + padding-left: 5px; + padding-right: 5px; + padding-bottom: 2px; + width: 800px; +} ==== //depot/projects/docproj_nl/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.222 2008/09/22 19:13:42 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.224 2008/11/09 18:29:53 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -138,6 +138,7 @@ 'OpenBSD 4.1' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', }, 'OpenBSD 4.2' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', }, 'OpenBSD 4.3' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', }, + 'OpenBSD 4.4' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', }, }; foreach my $os ( keys %$sectionpath ) { @@ -269,6 +270,7 @@ 'OpenBSD 4.1', "$manLocalDir/OpenBSD-4.1", 'OpenBSD 4.2', "$manLocalDir/OpenBSD-4.2", 'OpenBSD 4.3', "$manLocalDir/OpenBSD-4.3", + 'OpenBSD 4.4', "$manLocalDir/OpenBSD-4.4", #'NetBSD 0.9', "$manLocalDir/NetBSD-0.9", 'NetBSD 1.0', "$manLocalDir/NetBSD-1.0", @@ -401,6 +403,44 @@ "OpenDarwin 7.2.1", "$manLocalDir/OpenDarwin-7.2.1", ); +my @no_pdf_output = ( + '386BSD 0.0', + '386BSD 0.1', + '4.4BSD Lite2', + 'NetBSD 0.9', + 'NetBSD 1.0', + 'NetBSD 1.1', + 'NetBSD 1.2', + 'NetBSD 1.2.1', + 'OpenBSD 2.0', + 'OpenBSD 2.1', + 'OpenBSD 2.2', + 'OpenBSD 2.3', + 'OpenBSD 2.4', + 'OpenBSD 2.5', + 'OpenBSD 2.6', + 'OpenBSD 2.7', + 'OpenBSD 2.8', + 'OpenBSD 2.9', + 'OpenBSD 3.0', + 'OpenBSD 3.1', + 'OpenBSD 3.2', + 'OpenBSD 3.3', + 'OpenBSD 3.4', + 'OpenBSD 3.5', + 'OpenBSD 3.6', + 'OpenBSD 3.7', + 'OpenBSD 3.8', + 'OpenBSD 3.9', + 'OpenBSD 4.0', + 'OpenBSD 4.1', + 'OpenBSD 4.2', + 'OpenBSD 4.3', + 'OpenBSD 4.4', +); + +my %no_pdf_output = map { $_ => 1 } @no_pdf_output; + # delete not existing releases while ( ( $key, $val ) = each %manPath ) { my $counter = 0; @@ -438,7 +478,7 @@ 'macosx', 'Darwin 8.0.1/ppc', 'netbsd', 'NetBSD 4.0', - 'openbsd', 'OpenBSD 4.3', + 'openbsd', 'OpenBSD 4.4', 'v7', 'Unix Seventh Edition', 'v7man', 'Unix Seventh Edition', 'x11', 'X11R7.3.2', @@ -589,6 +629,8 @@ } } + $format = 'html' if $no_pdf_output{$manpath} && $format =~ /^(ps|pdf)$/; + local ($fform) = &dec($form); if ( $fform =~ m%^([a-zA-Z_\-\.:]+)$% ) { return &man( $1, '' ); @@ -1286,13 +1328,12 @@ <select name="format"> ETX - foreach ( - 'html', 'ps', 'pdf', + my @format = ('html'); + push( @format, ( 'pdf', 'ps' ) ) if !$no_pdf_output{$manpath}; + push( @format, ( 'latin1', 'ascii' ) ) + ; # you need a 8 bit clean man, e.g. jp-man - # you need a 8 bit clean man, e.g. jp-man - 'ascii', 'latin1' - ) - { + foreach (@format) { print qq{<option value="$_">$_</option>\n}; } @@ -1332,7 +1373,7 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.222 2008/09/22 19:13:42 wosch Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.224 2008/11/09 18:29:53 wosch Exp $'; return qq{\ <pre> Copyright (c) 1996-2008 <a href="$mailtoURL">Wolfram Schneider</a> ==== //depot/projects/docproj_nl/www/en/releases/6.4R/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/6.4R/Makefile,v 1.1 2008/08/22 14:30:38 hrs Exp $ +# $FreeBSD: www/en/releases/6.4R/Makefile,v 1.2 2008/11/06 15:47:57 hrs Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -7,7 +7,32 @@ .include "../Makefile.inc" .endif -DOCS= schedule.sgml +#DOCS= announce.sgml +DOCS= relnotes.sgml +DOCS+= hardware.sgml +DOCS+= installation.sgml +DOCS+= schedule.sgml + +DATA+= errata.html +DATA+= hardware-alpha.html +DATA+= hardware-amd64.html +DATA+= hardware-i386.html +DATA+= hardware-pc98.html +DATA+= hardware-powerpc.html +DATA+= hardware-sparc64.html +DATA+= installation-alpha.html +DATA+= installation-amd64.html +DATA+= installation-i386.html +DATA+= installation-pc98.html +DATA+= installation-powerpc.html +DATA+= installation-sparc64.html +DATA+= readme.html +DATA+= relnotes-alpha.html +DATA+= relnotes-amd64.html +DATA+= relnotes-i386.html +DATA+= relnotes-pc98.html +DATA+= relnotes-powerpc.html +DATA+= relnotes-sparc64.html DATA= docbook.css ==== //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ <!ENTITY base CDATA "../.."> <!ENTITY email 'freebsd-qa'> -<!ENTITY date "$FreeBSD: www/en/releases/6.4R/schedule.sgml,v 1.10 2008/10/29 20:14:32 hrs Exp $"> +<!ENTITY date "$FreeBSD: www/en/releases/6.4R/schedule.sgml,v 1.11 2008/11/06 15:47:10 hrs Exp $"> <!ENTITY local.rel "6.4"> <!ENTITY local.rel.tag "6_4"> <!ENTITY title "FreeBSD &local.rel; Release Process"> @@ -158,20 +158,20 @@ <tr> <td><tt>RC2</tt> builds</td> <td>22 September 2008</td> - <td>--</td> + <td>2 November 2008</td> <td>Begin RC2 builds.</td> </tr> <tr> <td><tt>RELEASE</tt> builds</td> - <td>TBD</td> + <td>12 November 2008</td> <td>--</td> <td>Begin RELEASE builds.</td> </tr> <tr> <td>Announcement</td> - <td>6 October 2008</td> + <td><strike>6 October 2008</strike></td> <td>--</td> <td>Announcement sent out after a majority of the mirrors have received the bits.</td>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811102129.mAALT19a037077>