PERFORCE change 205106 for review

[Rene Ladan]

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

Change 205106 by rene at 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