From a37c27b40171e283b118e0c375245bc593f23b11 Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Tue, 24 Jan 2012 21:11:16 +0000
Subject: [PATCH] MFen the Dutch Handbook: - advanced-networking 1.443 -> 1.444
 - cutting-edge 1.256 -> 1.257 Obtained from:	the FreeBSD Dutch
 Documentation Project

---
 .../books/handbook/advanced-networking/chapter.sgml        | 4 ++--
 nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml   | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index 6df0e76a61..4fb7a8eafe 100644
--- a/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -4,7 +4,7 @@
      $FreeBSD$
 
      %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 @@ mijnhost.voorbeeld.com:/b/tftpboot/FreeBSD/install      /         nfs      ro
 &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>
diff --git a/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml b/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
index 3a46d238ce..a76a485505 100644
--- a/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
+++ b/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
@@ -1,10 +1,10 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.27 2011/08/28 13:07:49 rene Exp $
+     $FreeBSD$
 
      %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 @@ DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
 	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