From owner-p4-projects@FreeBSD.ORG  Wed Oct 28 12:19:54 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D5EFD1065679; Wed, 28 Oct 2009 12:19:53 +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 82149106566C
	for <perforce@FreeBSD.org>; Wed, 28 Oct 2009 12:19:53 +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 6E3228FC0C
	for <perforce@FreeBSD.org>; Wed, 28 Oct 2009 12:19:53 +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 n9SCJrSr075692
	for <perforce@FreeBSD.org>; Wed, 28 Oct 2009 12:19:53 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9SCJrJm075690
	for perforce@freebsd.org; Wed, 28 Oct 2009 12:19:53 GMT
	(envelope-from rene@FreeBSD.org)
Date: Wed, 28 Oct 2009 12:19:53 GMT
Message-Id: <200910281219.n9SCJrJm075690@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 169881 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: Wed, 28 Oct 2009 12:19:54 -0000

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

Change 169881 by rene@rene_self on 2009/10/28 12:19:11

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#35 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#9 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/printing/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#21 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.877 2009/10/07 19:56:20 glarkin Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.879 2009/10/26 12:41:41 keramida Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -1901,6 +1901,11 @@
     </listitem>
 
     <listitem>
+      <para>Damian Gerow
+	<email>dgerow@afflictions.org</email></para>
+    </listitem>
+
+    <listitem>
       <para>Damian Hamill
 	<email>damian@cablenet.net</email></para>
     </listitem>
@@ -3395,7 +3400,7 @@
     </listitem>
 
     <listitem>
-      <para>Grün Christian-Rolf
+      <para>Gr&uuml;n Christian-Rolf
 	<email>kiki@bsdro.org</email></para>
     </listitem>
 
@@ -9804,7 +9809,7 @@
     </listitem>
 
     <listitem>
-      <para>Ulrich Spörlein
+      <para>Ulrich Sp&ouml;rlein
 	<email>uspoerlein@gmail.com</email></para>
     </listitem>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#9 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.238 2009/05/30 18:42:38 dougb Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.239 2009/10/25 21:21:54 keramida Exp $
 -->
 
 <chapter id="config-tuning">
@@ -2733,7 +2733,7 @@
 	<filename class="directory">src/sys/contrib/dev/acpica</filename>.
 	The glue code that allows <acronym>ACPI-CA</acronym> to work on
 	&os; is in
-	<filename>src/sys/dev/acpica/Osd</filename>.  Finally, drivers
+	<filename class="directory">src/sys/dev/acpica/Osd</filename>.  Finally, drivers
 	that implement various <acronym>ACPI</acronym> devices are found
 	in
 	<filename class="directory">src/sys/dev/acpica</filename>.</para>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.4 2008/10/18 14:27:07 remko Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.5 2009/10/20 21:06:57 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/printing/chapter.sgml
      %SRCID%	1.121

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

@@ -10,10 +10,183 @@
 <events>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/events.xml,v 1.75 2009/08/20 19:57:47 kib Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.77 2009/10/21 07:40:38 brueffer Exp $
     </cvs:keyword>
   </cvs:keywords>
 
+  <event id="bsdcan-2013">
+    <name>BSDCan 2013</name>
+    <url>http://www.bsdcan.org/</url>
+    <startdate>
+      <year>2013</year>
+      <month>5</month>
+      <day>13</day>
+    </startdate>
+    <enddate>
+      <year>2013</year>
+      <month>5</month>
+      <day>17</day>
+    </enddate>
+    <location>
+      <country code="CA">Canada</country>
+      <city>Ottawa</city>
+      <site>University of Ottawa</site>
+    </location>
+    <description>BSDCan is a developers conference with a strong focus
+      on emerging technologies, research projects, and works in
+      progress. It also features Userland infrastructure projects and
+      invites contributions from both free software developers and those
+      from commercial vendors.</description>
+  </event>
+
+  <event id="bsdcan-2012">
+    <name>BSDCan 2012</name>
+    <url>http://www.bsdcan.org/</url>
+    <startdate>
+      <year>2012</year>
+      <month>5</month>
+      <day>15</day>
+    </startdate>
+    <enddate>
+      <year>2012</year>
+      <month>5</month>
+      <day>18</day>
+    </enddate>
+    <location>
+      <country code="CA">Canada</country>
+      <city>Ottawa</city>
+      <site>University of Ottawa</site>
+    </location>
+    <description>BSDCan is a developers conference with a strong focus
+      on emerging technologies, research projects, and works in
+      progress. It also features Userland infrastructure projects and
+      invites contributions from both free software developers and those
+      from commercial vendors.</description>
+  </event>
+
+  <event id="bsdcan-2011">
+    <name>BSDCan 2011</name>
+    <url>http://www.bsdcan.org/</url>
+    <startdate>
+      <year>2011</year>
+      <month>5</month>
+      <day>10</day>
+    </startdate>
+    <enddate>
+      <year>2011</year>
+      <month>5</month>
+      <day>13</day>
+    </enddate>
+    <location>
+      <country code="CA">Canada</country>
+      <city>Ottawa</city>
+      <site>University of Ottawa</site>
+    </location>
+    <description>BSDCan is a developers conference with a strong focus
+      on emerging technologies, research projects, and works in
+      progress. It also features Userland infrastructure projects and
+      invites contributions from both free software developers and those
+      from commercial vendors.</description>
+  </event>
+
+  <event id="eurobsdcon-2010">
+    <name>EuroBSDCon 2010</name>
+    <url>http://2010.eurobsdcon.org/</url>
+    <startdate>
+      <year>2010</year>
+      <month>10</month>
+      <day>8</day>
+    </startdate>
+    <enddate>
+      <year>2010</year>
+      <month>10</month>
+      <day>10</day>
+    </enddate>
+    <location>
+      <country code="DE">Germany</country>
+      <city>Karlsruhe</city>
+    </location>
+    <description>The ninth annual European BSD Conference will take place
+      in Karlsruhe, Germany in October, 2010, and include a technical
+      track, tutorials, and FreeBSD developer summit.</description>
+  </event>
+
+  <event id="bsdcan-2010">
+    <name>BSDCan 2010</name>
+    <url>http://www.bsdcan.org/</url>
+    <startdate>
+      <year>2010</year>
+      <month>5</month>
+      <day>11</day>
+    </startdate>
+    <enddate>
+      <year>2010</year>
+      <month>5</month>
+      <day>14</day>
+    </enddate>
+    <location>
+      <country code="CA">Canada</country>
+      <city>Ottawa</city>
+      <site>University of Ottawa</site>
+    </location>
+    <description>BSDCan is a developers conference with a strong focus
+      on emerging technologies, research projects, and works in
+      progress. It also features Userland infrastructure projects and
+      invites contributions from both free software developers and those
+      from commercial vendors.</description>
+  </event>
+
+  <event id="asiabsdcon-2010">
+    <name>AsiaBSDCon 2010</name>
+    <url>http://2010.asiabsdcon.org/</url>
+    <startdate>
+      <year>2010</year>
+      <month>3</month>
+      <day>11</day>
+    </startdate>
+    <enddate>
+      <year>2010</year>
+      <month>3</month>
+      <day>14</day>
+    </enddate>
+    <location>
+      <country code="JP">Japan</country>
+      <city>Tokyo</city>
+      <site>Tokyo University of Science</site>
+    </location>
+    <description>AsiaBSDCon is a conference for users and developers on BSD
+      based systems.  The conference is for anyone developing, deploying and
+      using systems based on FreeBSD, NetBSD, OpenBSD, DragonFlyBSD, Darwin
+      and MacOS X.  AsiaBSDCon is a technical conference and aims to collect
+      the best technical papers and presentations available to ensure that
+      the latest developments in our open source community are shared with
+      the widest possible audience.</description>
+  </event>
+
+  <event id="fosdem-2010">
+    <name>FOSDEM '10</name>
+    <url>http://fosdem.org/2010/</url>
+    <startdate>
+      <year>2010</year>
+      <month>2</month>
+      <day>6</day>
+    </startdate>
+    <enddate>
+      <year>2010</year>
+      <month>2</month>
+      <day>7</day>
+    </enddate>
+    <location>
+      <country code="BE">Belgium</country>
+      <city>Brussels</city>
+      <site>ULB Campus Solbosh</site>
+    </location>
+    <description>FOSDEM '10 is a free and non-commercial event organized
+      by the community, for the community.  Its goal is to provide Free
+      and Open Source developers a place to meet.  Several &os;
+      developers will be present.</description>
+  </event>
+
   <event id="open-rheinruhr-2009">
     <name>OpenRheinRuhr 2009</name>
     <url>http://www.openrheinruhr.de/</url>
@@ -151,7 +324,7 @@
       <site>University of Cambridge</site>
     </location>
 
-    <description>The ninth annual European BSD Conference will take place
+    <description>The eighth annual European BSD Conference will take place
       in Cambridge, England in September, 2009, and include a technical
       track, tutorials, and FreeBSD developer summit.</description>
   </event>