From owner-p4-projects@FreeBSD.ORG  Mon Dec  7 12:10:35 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4F8AA10656A9; Mon,  7 Dec 2009 12:10:35 +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 13E411065692
	for <perforce@FreeBSD.org>; Mon,  7 Dec 2009 12:10:35 +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 004698FC24
	for <perforce@FreeBSD.org>; Mon,  7 Dec 2009 12:10:35 +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 nB7CAYrI095927
	for <perforce@FreeBSD.org>; Mon, 7 Dec 2009 12:10:34 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nB7CAYJT095925
	for perforce@freebsd.org; Mon, 7 Dec 2009 12:10:34 GMT
	(envelope-from rene@FreeBSD.org)
Date: Mon, 7 Dec 2009 12:10:34 GMT
Message-Id: <200912071210.nB7CAYJT095925@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 171486 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: Mon, 07 Dec 2009 12:10:35 -0000

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

Change 171486 by rene@rene_self on 2009/12/07 12:10:15

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#39 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#18 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#58 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml#24 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#39 integrate
.. //depot/projects/docproj_nl/www/nl/administration.sgml#16 edit
.. //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#12 edit

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.882 2009/11/18 14:24:58 mandree Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.884 2009/12/05 03:50:17 glarkin Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -978,6 +978,11 @@
     </listitem>
 
     <listitem>
+      <para>Aragon Gouveia
+	<email>aragon@phat.za.net</email></para>
+    </listitem>
+
+    <listitem>
       <para>Are Bryne
 	<email>are.bryne@communique.no</email></para>
     </listitem>
@@ -9200,6 +9205,11 @@
     </listitem>
 
     <listitem>
+      <para>Sutra Zhou
+	<email>zhoushuqun@gmail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Suzuki Yoshiaki
 	<email>zensyo@ann.tama.kawasaki.jp</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#18 (text+ko) ====

@@ -11,7 +11,7 @@
       <corpauthor>The &os; Ports Management Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.48 2009/11/26 08:05:51 linimon Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.49 2009/12/06 05:53:37 linimon Exp $</pubdate>
 
     <copyright>
       <year>2003</year>
@@ -1436,6 +1436,8 @@
 
 gmond_enable="YES"
 squid_enable="YES"
+squid_chdir="<filename>/<replaceable>usr2</replaceable>/local/squid/logs</filename>"
+squid_pidfile="<filename>/<replaceable>usr2</replaceable>/squid/logs/squid.pid</filename>"
 </screen>
 	      </para>
 	    </listitem>
@@ -1448,7 +1450,7 @@
 	    <listitem>
 	      <para>Modify <filename>etc/sysctl.conf</filename>:<screen>
 9a10,30
-> kern.corefile=/tmp/%N.core
+> kern.corefile=<filename>/<replaceable>usr2</replaceable>/%N.core</filename>
 > kern.sugid_coredump=1
 > #debug.witness_ddb=0
 > #debug.witness_watch=0
@@ -1550,9 +1552,9 @@
 #
 # Configure a package build system post-boot
 
-scratchdir=/usr2
+scratchdir=<filename>/<replaceable>usr2</replaceable></filename>
 
-ln -sf ${scratchdir}/portbuild /var/portbuild
+ln -sf ${scratchdir}/portbuild /var/
 
 # Identify builds ready for use
 cd /var/portbuild/${arch}
@@ -1569,20 +1571,6 @@
 
 	    <listitem>
 	      <para>Modify
-		 <filename>usr/local/etc/rc.d/squid</filename>:<screen>
-40c40
-< squid_chdir=${squid_chdir:-"/usr/local/squid/logs"}
----
-> squid_chdir=${squid_chdir:-"/usr2/squid/logs"}
-43c43
-< squid_pidfile=${squid_pidfile:-"/usr/local/squid/logs/squid.pid"}
----
-> squid_pidfile=${squid_pidfile:-"/usr2/squid/logs/squid.pid"}</screen>
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>Modify
 		 <filename>usr/local/etc/squid/squid.conf</filename>:<screen>
 288,290c288,290
 < #auth_param basic children 5
@@ -1603,7 +1591,7 @@
 	      </para>
 
 	      <para>Also, change <filename>usr/local</filename>
-		to <filename>usr2</filename> in the definitions of
+		to <filename><replaceable>usr2</replaceable></filename> in
 		<literal>cache_dir</literal>,
 		<literal>access_log</literal>,
 		<literal>cache_log</literal>,
@@ -1649,7 +1637,9 @@
       <procedure>
 	<step>
 	  <para>Change into the port/package directory you picked
-	    above, e.g., <command>cd /usr2</command>.</para>
+	    above, e.g.,
+	    <command>cd <filename>/<replaceable>usr2</replaceable></filename></command>.
+	  </para>
 	</step>
 
 	<step>
@@ -1752,8 +1742,8 @@
 	  <para>Suggested values:<screen>
 disconnected=1
 http_proxy="http://localhost:3128/"
-squid_dir=/usr2/squid
-scratchdir=/usr2/pkgbuild
+squid_dir=<filename>/<replaceable>usr2</replaceable>/squid</filename>
+scratchdir=<filename>/<replaceable>usr2</replaceable>/pkgbuild</filename>
 client_user=ports-<replaceable>${arch}</replaceable>
 sudo_cmd="sudo -H"
 rsync_gzip=-z

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1037 2009/12/03 13:54:47 pav Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1038 2009/12/06 20:33:38 ed Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -13439,6 +13439,12 @@
 		      <function>sigpause(3)</function> and PIE
 		      support in csu.</entry>
 		  </row>
+		  <row>
+		    <entry>900004</entry>
+		    <entry>December 6, 2009</entry>
+		    <entry>9.0-CURRENT after addition of libulog and its
+		      libutempter compatibility interface.</entry>
+		  </row>
 		</tbody>
 	      </tgroup>
 	    </table>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.18 2009/11/29 17:46:16 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.19 2009/12/05 20:33:10 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/introduction/chapter.sgml
      %SRCID%	1.137

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

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

==== //depot/projects/docproj_nl/www/nl/administration.sgml#16 (text+ko) ====

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/nl/administration.sgml,v 1.6 2009/11/29 17:48:52 rene Exp $">
+<!ENTITY date "$FreeBSD: www/nl/administration.sgml,v 1.7 2009/12/06 10:39:51 rene Exp $">
 <!ENTITY title "&os; Project Regelgeving en Beheer">
 <!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../en/developers.sgml"> %developers;
@@ -7,7 +7,7 @@
 <!--
      Vertaald door: Rene Ladan
      %SOURCE%	en/administration.sgml
-     %SRCID%	1.31
+     %SRCID%	1.32
 -->
 <html>
   &header;
@@ -154,7 +154,6 @@
     <li>&a.kib; &lt;<a href="mailto:kib@FreeBSD.org">kib@FreeBSD.org</a>&gt;</li>
     <li>&a.blackend; &lt;<a href="mailto:blackend@FreeBSD.org">blackend@FreeBSD.org</a>&gt;</li>
     <li>&a.mux; &lt;<a href="mailto:mux@FreeBSD.org">mux@FreeBSD.org</a>&gt;</li>
-    <li>&a.bmah; &lt;<a href="mailto:bmah@FreeBSD.org">bmah@FreeBSD.org</a>&gt;</li>
     <li>&a.gnn; &lt;<a href="mailto:gnn@FreeBSD.org">gnn@FreeBSD.org</a>&gt;</li>
     <li>&a.hrs; &lt;<a href="mailto:hrs@FreeBSD.org">hrs@FreeBSD.org</a>&gt;</li>
     <li>&a.kensmith; &lt;<a href="mailto:kensmith@FreeBSD.org">kensmith@FreeBSD.org</a>&gt;

==== //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#12 (text+ko) ====

@@ -1,6 +1,6 @@
-<!-- $FreeBSD: www/nl/share/sgml/navibar.l10n.ent,v 1.2 2009/06/10 21:50:50 rene Exp $
+<!-- $FreeBSD: www/nl/share/sgml/navibar.l10n.ent,v 1.3 2009/12/06 10:39:51 rene Exp $
      %SOURCE%	share/sgml/navibar.ent
-     %SRCID%	1.27
+     %SRCID%	1.29
  -->
 
 <!ENTITY % navinclude.about "IGNORE">
@@ -122,7 +122,7 @@
     <li><a href="&enbase;/gnome/index.html">&os;/GNOME</a>
       <ul>
         <li><a href="&enbase;/gnome/docs/faq2.html#q1">Installatie-instructies</a></li>
-        <li><a href="&enbase;/gnome/docs/faq226.html#q2">Bijwerkinstructies</a></li>
+        <li><a href="&enbase;/gnome/docs/faq228.html#q2">Bijwerkinstructies</a></li>
         <li><a href="&enbase;/gnome/../ports/gnome.html">Beschikbare applicaties</a></li>
         <li><a href="&enbase;/gnome/docs/volunteer.html">Hoe te helpen</a></li>
         <li><a href="&enbase;/gnome/docs/bugging.html">Rapporteer een bug</a></li>
@@ -133,10 +133,10 @@
       <ul>
         <li><a href="&enbase;/gnome/docs/faq2.html">FAQ</a></li>
 	<li><a href="&enbase;/gnome/docs/halfaq.html">HAL FAQ</a></li>
-        <li><a href="&enbase;/gnome/docs/faq226.html">2.24 naar 2.26 bijwerk-FAQ</a></li>
+        <li><a href="&enbase;/gnome/docs/faq228.html">2.26 naar 2.28 bijwerk-FAQ</a></li>
         <li><a href="&enbase;/gnome/docs/develfaq.html">Ontwikkeltak FAQ</a></li>
         <li><a href="&enbase;/gnome/docs/porting.html">Ports maken</a></li>
-        <li><a href="&enbase;/gnome/docs/faq226.html#q4">Bekende problemen</a></li>
+        <li><a href="&enbase;/gnome/docs/faq228.html#q4">Bekende problemen</a></li>
       </ul></li>
     </ul>
 </div> <!-- SIDENAV -->'>