From owner-p4-projects@FreeBSD.ORG  Tue Jan 24 21:05:32 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CCBCC1065675; Tue, 24 Jan 2012 21:05:31 +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 8F95C106566B
	for <perforce@FreeBSD.org>; Tue, 24 Jan 2012 21:05:31 +0000 (UTC)
	(envelope-from rene@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 62ED38FC17
	for <perforce@FreeBSD.org>; Tue, 24 Jan 2012 21:05:31 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q0OL5VLN060596
	for <perforce@FreeBSD.org>; Tue, 24 Jan 2012 21:05:31 GMT
	(envelope-from rene@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q0OL5VCo060593
	for perforce@freebsd.org; Tue, 24 Jan 2012 21:05:31 GMT
	(envelope-from rene@FreeBSD.org)
Date: Tue, 24 Jan 2012 21:05:31 GMT
Message-Id: <201201242105.q0OL5VCo060593@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.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 205106 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: Tue, 24 Jan 2012 21:05:32 -0000

http://p4web.freebsd.org/@@205106?ac=10

Change 205106 by rene@rene_acer on 2012/01/24 21:04:41

	MFen the Dutch Handbook:
	- advanced-networking 1.443 -> 1.444	
	- cutting-edge 1.256 -> 1.257

Affected files ...

.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#72 edit
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#46 edit

Differences ...

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

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.34 2012/01/19 21:21:56 rene Exp $
 
      %SOURCE%  en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
-     %SRCID%   1.443
+     %SRCID%   1.444
 -->
 
 <chapter id="advanced-networking">
@@ -4722,7 +4722,7 @@
 &prompt.root; <userinput>passwd</userinput></screen>
 
 	  <para>Dit stelt het root-wachtwoord in voor cli&euml;ntmachines die
-	    over <acronym>PXE</acronym> opstarten.
+	    over <acronym>PXE</acronym> opstarten.</para>
 	</step>
 
 	<step>

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

@@ -4,7 +4,7 @@
      $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.28 2011/12/18 20:05:49 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
-     %SRCID%	1.256
+     %SRCID%	1.257
 -->
 
 <chapter id="updating-upgrading">
@@ -2296,9 +2296,6 @@
 	het succes van <maketarget>buildworld</maketarget> of
 	<maketarget>installworld</maketarget>:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/mergemaster</userinput>
-&prompt.root; <userinput>./mergemaster.sh -p</userinput></screen>
-
       <tip>
 	<para>In <quote>paranoide beheerdersmodus</quote> kan er
 	  gecontroleerd worden welke bestanden op een systeem eigendom