From owner-p4-projects@FreeBSD.ORG  Sun Dec 27 18:24:46 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B565A106568F; Sun, 27 Dec 2009 18:24:45 +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 60B6A106568B
	for <perforce@FreeBSD.org>; Sun, 27 Dec 2009 18:24:45 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4DAA88FC14
	for <perforce@FreeBSD.org>; Sun, 27 Dec 2009 18:24:45 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBRIOjcO033463
	for <perforce@FreeBSD.org>; Sun, 27 Dec 2009 18:24:45 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBRIOj11033461
	for perforce@freebsd.org; Sun, 27 Dec 2009 18:24:45 GMT
	(envelope-from rene@FreeBSD.org)
Date: Sun, 27 Dec 2009 18:24:45 GMT
Message-Id: <200912271824.nBRIOj11033461@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 172292 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Dec 2009 18:24:46 -0000

http://p4web.freebsd.org/chv.cgi?CH=172292

Change 172292 by rene@rene_self on 2009/12/27 18:24:01

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#41 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#34 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#63 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#28 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#41 integrate
.. //depot/projects/docproj_nl/share/mk/doc.images.mk#2 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#30 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#27 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/ryusuke.key#1 branch
.. //depot/projects/docproj_nl/www/en/cgi/man.cgi#11 integrate
.. //depot/projects/docproj_nl/www/en/cgi/query-pr-lib.pl#2 integrate
.. //depot/projects/docproj_nl/www/en/copyright/daemon.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/developers.sgml#28 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#22 integrate
.. //depot/projects/docproj_nl/www/en/news/status/README#2 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#15 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.hardware.xml#3 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#14 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#61 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#41 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.885 2009/12/09 20:56:30 gavin Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.886 2009/12/22 17:52:43 delphij Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -7706,6 +7706,11 @@
     </listitem>
 
     <listitem>
+      <para>Pengfei JU
+	<email>jupengfei@gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Per Wigren
 	<email>wigren@home.se</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#34 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.277 2009/12/09 20:56:30 gavin Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.278 2009/12/22 15:43:14 ryusuke Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -1439,6 +1439,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.ryusuke;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.suz;</para>
     </listitem>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#63 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1040 2009/12/20 16:25:55 gabor Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1041 2009/12/20 19:26:07 pav Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -8590,6 +8590,25 @@
 	  you will not have to change dozens (or in some cases, hundreds) of
 	  lines in the <filename>pkg-plist</filename>.</para>
 
+	<para>If your port installs files conditionally on the options
+	  set in the port, the usual way of handling it is prefixing
+	  the <filename>pkg-plist</filename> lines with
+	  a <literal>%%TAG%%</literal> and adding that <literal>TAG</literal>
+	  to the <makevar>PLIST_SUB</makevar> variable inside the
+	  <filename>Makefile</filename> with a special value of
+	  <literal>@comment</literal>, which makes package tools to ignore the
+	  line:</para>
+
+	<programlisting>.if defined(WITH_X11)
+PLIST_SUB+=	X11=""
+.else
+PLIST_SUB+=	X11="@comment "
+.endif</programlisting>
+
+	<para>and in the <filename>pkg-plist</filename>:</para>
+
+	<programlisting>%%X11%%bin/foo-gui</programlisting>
+
 	<para>This substitution (as well as addition of any <link
 	  linkend="makefile-manpages">manual pages</link>) will be done between
 	  the <maketarget>pre-install</maketarget> and

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#28 (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.492 2009/11/18 13:39:41 mandree Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.493 2009/12/22 15:43:15 ryusuke Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>">
@@ -956,6 +956,8 @@
 
 <!ENTITY a.rwatson "Robert Watson <email>rwatson@FreeBSD.org</email>">
 
+<!ENTITY a.ryusuke "Ryusuke SUZUKI <email>ryusuke@FreeBSD.org</email>">
+
 <!ENTITY a.sada "SADA Kenji <email>sada@FreeBSD.org</email>">
 
 <!ENTITY a.sah "Sam Hopkins <email>sah@FreeBSD.org</email>">

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#41 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.32 2009/12/05 20:33:10 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml,v 1.33 2009/12/20 17:45:46 rene Exp $
      Vertaald door: Siebrand Mazeland / Rene Ladan
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml

==== //depot/projects/docproj_nl/share/mk/doc.images.mk#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: doc/share/mk/doc.images.mk,v 1.29 2004/07/23 18:58:56 hrs Exp $
+# $FreeBSD: doc/share/mk/doc.images.mk,v 1.31 2009/12/25 18:12:00 hrs Exp $
 #
 # This include file <doc.images.mk> handles image processing.
 #
@@ -160,6 +160,10 @@
 PS2EPSOPTS?=	-q -dNOPAUSE -dSAFER -dDELAYSAFER \
 		-sPAPERSIZE=letter -r72 -sDEVICE=bit \
 		-sOutputFile=/dev/null ${PS2EPSFLAGS} ps2epsi.ps
+PS2BBOX?=	${PREFIX}/bin/gs
+PS2BBOXOPTS?=	-q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER \
+		-sPAPERSIZE=letter -r72 -sDEVICE=bbox \
+		-sOutputFile=/dev/null ${PS2BBOXFLAGS}
 #
 # Use suffix rules to convert .scr files to other formats
 .SUFFIXES:	.scr .pic .png .ps .eps .txt
@@ -202,7 +206,12 @@
 # from the command line.  So ps->eps suffix rule is defined.  In the rule,
 # gs(1) is used to generate the bitmap preview and the size of the
 # bounding box.
+#
+# ps2epsi.ps in GS 8.70 requires $outfile before the conversion and it
+# must contain %%BoundingBox line which the "gs -sDEVICE=bbox" outputs
+# (the older versions calculated BBox directly in ps2epsi.ps).
 .ps.eps:
+	${PS2BBOX} ${PS2BBOXOPTS} ${.ALLSRC} > ${.TARGET} 2>&1
 	${SETENV} outfile=${.TARGET} ${PS2EPS} ${PS2EPSOPTS} < ${.ALLSRC} 1>&2
 	(echo "save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def";\
 		echo "%%EndProlog";\

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#30 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.112 2009/11/18 13:51:20 mandree Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.113 2009/12/22 15:43:15 ryusuke Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -1311,6 +1311,11 @@
       &pgpkey.metal;
     </sect2>
 
+    <sect2 id="pgpkey-ryusuke">
+      <title>&a.ryusuke;</title>
+      &pgpkey.ryusuke;
+    </sect2>
+
     <sect2 id="pgpkey-garys">
       <title>&a.garys;</title>
       &pgpkey.garys;

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#27 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.205 2009/11/18 13:51:20 mandree Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.206 2009/12/22 15:43:15 ryusuke Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -260,6 +260,7 @@
 <!ENTITY pgpkey.rrs SYSTEM "rrs.key">
 <!ENTITY pgpkey.ru SYSTEM "ru.key">
 <!ENTITY pgpkey.rushani SYSTEM "rushani.key">
+<!ENTITY pgpkey.ryusuke SYSTEM "ryusuke.key">
 <!ENTITY pgpkey.sam SYSTEM "sam.key">
 <!ENTITY pgpkey.sanpei SYSTEM "sanpei.key">
 <!ENTITY pgpkey.sat SYSTEM "sat.key">

==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#11 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -T
 #
-# Copyright (c) 1996-2008 Wolfram Schneider <wosch@FreeBSD.org>
+# Copyright (c) 1996-2010 Wolfram Schneider <wosch@FreeBSD.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -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.239 2009/11/23 18:45:05 wosch Exp $
+# $FreeBSD: www/en/cgi/man.cgi,v 1.242 2009/12/21 11:10:20 wosch Exp $
 
 ############################################################################
 # !!! man.cgi is stale perl4 code !!!
@@ -201,9 +201,11 @@
 "$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports",
 
     'FreeBSD Ports', "$manLocalDir/FreeBSD-ports",
-    'FreeBSD 8-current', "$manLocalDir/FreeBSD-8-current/man:$manLocalDir/FreeBSD-8-current/openssl/man",
+    'FreeBSD 9-current', "$manLocalDir/FreeBSD-9-current/man:$manLocalDir/FreeBSD-9-current/openssl/man",
 
     'FreeBSD 8.0-RELEASE', "$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-8.0-RELEASE/openssl/man",
+    'FreeBSD 8.0-stable', "$manLocalDir/FreeBSD-8.0-stable/man:$manLocalDir/FreeBSD-8.0-stable/openssl/man",
+
     'FreeBSD 7.2-stable', "$manLocalDir/FreeBSD-7.2-stable",
     'FreeBSD 7.2-RELEASE', "$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man",
     'FreeBSD 7.1-RELEASE', "$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man",
@@ -520,7 +522,7 @@
     'freebsd-stable7', 'FreeBSD 7.2-stable',
     'freebsd-stable6', 'FreeBSD 6.4-stable',
 
-    'freebsd-current',       'FreeBSD 8-current',
+    'freebsd-current',       'FreeBSD 9-current',
     'freebsd-release-ports', 'FreeBSD 8.0-RELEASE and Ports',
 
     'slackware',  'Linux Slackware 3.1',
@@ -1427,10 +1429,10 @@
     }
 
     local $id =
-      '$FreeBSD: www/en/cgi/man.cgi,v 1.239 2009/11/23 18:45:05 wosch Exp $';
+      '$FreeBSD: www/en/cgi/man.cgi,v 1.242 2009/12/21 11:10:20 wosch Exp $';
     return qq{\
 <pre>
-Copyright (c) 1996-2008 <a href="$mailtoURL">Wolfram Schneider</a>
+Copyright (c) 1996-2010 <a href="$mailtoURL">Wolfram Schneider</a>
 Copyright (c) 1993-1995 Berkeley Software Design, Inc.
 
 This data is part of a licensed program from BERKELEY SOFTWARE

==== //depot/projects/docproj_nl/www/en/cgi/query-pr-lib.pl#2 (text+ko) ====

@@ -144,7 +144,9 @@
 <td><b>Release</b>:</td>
 <td><select name='release'>
 <option selected='selected' value=''>Any</option>
-<option value='^FreeBSD [2345]'>Pre-6.X</option>
+<option value='^FreeBSD [2345678]'>Pre-8.X</option>
+<option value='^FreeBSD 9'>9.X only</option>
+<option value='^FreeBSD 8'>8.X only</option>
 <option value='^FreeBSD 7'>7.X only</option>
 <option value='^FreeBSD 6'>6.X only</option>
 <option value='^FreeBSD 5'>5.X only</option>

==== //depot/projects/docproj_nl/www/en/copyright/daemon.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/copyright/daemon.sgml,v 1.29 2006/08/19 21:20:32 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/en/copyright/daemon.sgml,v 1.30 2009/12/26 19:28:38 wosch Exp $">
 <!ENTITY title "The BSD Daemon">
 <!ENTITY % navinclude.about "INCLUDE">
 ]>
@@ -45,9 +45,7 @@
 
     <p>Various size stuffed and beanie daemons are available from
     <a href="http://www.freebsdmall.com">the FreeBSD Mall</a>
-    <img alt="beanie daemon" src="../gifs/plueschtier-tiny.jpg">.  In Europe, German-made
-    stuffed daemons are also available from
-    <a href="http://lem.freibergnet.de/fgnet/fanshop.html">Liebscher &amp; Partner</a>.
+    <img alt="beanie daemon" src="../gifs/plueschtier-tiny.jpg">.  
 
     <p><a href="http://www.scotgold.com/acatalog/ScotGold_Catalogue_BSD_Daemon_Stuff_3.html">ScotGold</a>
     produce 1" case badges featuring BSD Daemon.

==== //depot/projects/docproj_nl/www/en/developers.sgml#28 (text+ko) ====

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.235 2009/12/09 20:46:21 gavin Exp $
+$FreeBSD: www/en/developers.sgml,v 1.236 2009/12/22 15:48:47 ryusuke Exp $
 
 -->
 
@@ -477,6 +477,7 @@
 <!ENTITY a.rv "Rajesh Vaidheeswarran">
 <!ENTITY a.rvb "Robert V. Baron">
 <!ENTITY a.rwatson "Robert Watson">
+<!ENTITY a.ryusuke "Ryusuke SUZUKI">
 <!ENTITY a.sada "SADA Kenji">
 <!ENTITY a.sah "Sam Hopkins">
 <!ENTITY a.sam "Sam Leffler">

==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#22 (text+ko) ====

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.397 2009/10/01 20:37:57 gahr Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/donors.sgml,v 1.398 2009/12/21 13:27:41 gahr Exp $">
 <!ENTITY title "Hardware Donors Page">
 <!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
@@ -2650,6 +2650,13 @@
     <td> cracauer </td>
     <td> Received </td>
   </tr>
+
+  <tr>
+    <td> Ivan Jedek </td>
+    <td> 2 Sun Fire V65 </td>
+    <td> miwi (for pkg build cluster) </td>
+    <td> Received </td>
+  </tr>
 </table>
 
 &footer;

==== //depot/projects/docproj_nl/www/en/news/status/README#2 (text+ko) ====

@@ -29,10 +29,9 @@
     the closing "/>" which is the cause for most of the errors you will
     encounter.  Sometimes other closing tags are missing.
   - Invoking tidy with the following options seems to cause the fewest
-    problems: tidy -xml -i -wrap 74 -latin1
+    problems: tidy -xml -i -wrap 74 -latin1 -preserve
   - Some special characters still break with that - noticed when sos@
-    submits a report.  The o with the slash is "&#248;" in xml.  Our current
-    tools don't support "&oslash;" from html.
+    submits a report.
   - Remove empty "<help></help>" sections, they cause a strange looking
     newline.
   - The <body> part usually needs a hand to make it proper html.  Use <a
@@ -52,7 +51,7 @@
 <!DOCTYPE report PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Status
 Report//EN"
 "http://www.FreeBSD.org/XML/www/share/sgml/statusreport.dtd">
-<!-- $FreeBSD: www/en/news/status/README,v 1.5 2007/10/08 16:54:13 brd Exp $ -->
+<!-- $FreeBSD: www/en/news/status/README,v 1.6 2009/12/22 12:09:10 danger Exp $ -->
 <report>
   <date>
     <month>July-September</month>

==== //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#15 (text+ko) ====

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
                          "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.67 2009/11/10 15:12:36 roam Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.68 2009/12/21 21:00:37 jkois Exp $ -->
 
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.67 2009/11/10 15:12:36 roam Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.68 2009/12/21 21:00:37 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -1370,6 +1370,20 @@
     </description>
   </entry>
 
+  <entry id="WhiteQueueConsulting" category="nzealand">
+    <name>White Queue Consulting</name>
+    <url>http://whitequeue.com/</url>
+    <description>
+      White Queue Consulting provides embedded FreeBSD kernel and
+      userland development.  Our services include device driver
+      development, kernel porting, software design and development in
+      the kernel and userland.  We are able to work with clients in any
+      location.  For further information contact us through our <a
+      href="http://whitequeue.com/contact/">contact form</a> or visit
+      the <a href="http://whitequeue.com/">White Queue website</a>.
+    </description>
+  </entry>
+  
   <entry id="CrepidoSystems" category="europe">
     <name>Crepido Systems AB</name>
     <url>http://www.crepido.com</url>

==== //depot/projects/docproj_nl/www/share/sgml/commercial.hardware.xml#3 (text+ko) ====

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
                          "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $FreeBSD: www/share/sgml/commercial.hardware.xml,v 1.7 2008/08/26 08:58:07 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.hardware.xml,v 1.8 2009/12/20 22:53:09 jkois Exp $ -->
 
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/commercial.hardware.xml,v 1.7 2008/08/26 08:58:07 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.hardware.xml,v 1.8 2009/12/20 22:53:09 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -792,6 +792,49 @@
     </description>
   </entry>
 
+  <entry id="servaris">
+    <name>Servaris Corporation</name>
+    <url>http://www.servaris.com</url>
+    <description>
+      <p>Servaris builds Premium Rack Mount, <a
+	href="http://www.servaris.com/blade_servers.php" title="Blade
+	Servers	with Fail-over and Clustering">Blade Servers</a> and <a
+	href="http://www.servaris.com/tower_servers.php" title="Tower
+	Servers">Tower Servers</a> as well as <a
+	href="http://www.servaris.com/raid.php" title="RAID Storage
+	Subsystems">RAID Storage</a> Subsystems.</p>
+ 
+      <p>Servaris ProServ <a
+	href="http://www.servaris.com/1u_rack_server.php" title="FreeBSD
+	1U Rack Servers">1U Rack Servers</a> and ProServ <a
+	href="http://www.servaris.com/2u-rack-server.php" title="FreeBSD
+	2U Rack Servers"> 2U Rack Servers</a> and 4U <a
+	href="http://www.servaris.com/servers_4680.php" title="Quad
+	Six-Core Rack Server">High Performance Computing Server</a> are
+	all FreeBSD compatible.  Almost all the ProServ Servers have
+	lights-out remote management via java enabled web browser.
+	Servaris will pre-install FreeBSD AMD/64 or i386 with a Generic
+	or fully customized FreeBSD installation.  Servaris <a
+	href="http://www.servaris.com/blade_servers.php" title="Blade
+	Servers	by Servaris">Blade Servers</a> are an 'all in one'
+	clustering and fail-over solution with complete remote management
+	via any java enabled web browser and feature Intel's latest 5500
+	Quad Core Xeon Processors.  <a
+	href="http://www.servaris.com/raid.php" title="iStor RAID Storage
+	Systems"> Servaris iStor RAID Storage</a> Subsystems are 4GB/8GB
+	Fibre to SAS/SATA and are available in 12-Bay, 16-Bay and 24-Bay
+	Chassis.  asily expandable, simple to maintain and completely
+	manageable via web browser.</p>
+
+      <p>Servaris has friendly staff that can answer your questions.
+	Please give Servaris a call at 1.877.963.1900 or <a
+	href="http://www.servaris.com/contact.php">contact them from
+	here</a>.  Servaris will provide you with Superior Quality
+	Servers and RAID Systems with excellent Warranties at
+	reasonable prices:  "Servaris, Excellence through Passion."</p>
+    </description>
+  </entry>
+
   <entry id="servprise">
     <name>Servprise International</name>
     <url>http://www.servprise.com</url>

==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#14 (text+ko) ====

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
                             "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">
-<!-- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.52 2009/11/05 12:39:39 remko Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.53 2009/12/21 21:20:43 jkois Exp $ -->
 
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.52 2009/11/05 12:39:39 remko Exp $
+      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.53 2009/12/21 21:20:43 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -109,6 +109,18 @@
     </description>
   </entry>
 
+  <entry id="bsdix">
+    <name>BSDiX</name>
+    <url>http://www.bsdix.com</url>
+    <description>
+      BSDiX is a hosting company specializing in FreeBSD hosting
+      including shared hosting, VPS (Virtual Private Servers), fully
+      managed dedicated servers, website hosting, e-mail hosting, dns
+      hosting and other hosting services exclusively on FreeBSD.
+      Our headquarters is in Oslo, Norway.
+    </description>
+  </entry>
+
   <entry id="dbi">
     <name>DBI Hosting</name>
     <url>http://www.dbihosting.com</url>

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#61 (text+ko) ====

@@ -25,7 +25,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.282 2009/12/09 21:15:22 gavin Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.283 2009/12/22 15:48:47 ryusuke Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -34,7 +34,16 @@
 
     <month>
       <name>12</name>
-      
+
+      <day>
+	<name>20</name>
+
+	<event>
+	  <p>New committer: <a href="mailto:ryusuke@FreeBSD.org">Ryusuke
+	    SUZUKI</a> (doc/ja_JP, www/ja)</p>
+	</event>
+      </day>
+
       <day>
         <name>7</name>