svn commit: r39971 - translations/nl_NL.ISO8859-1/books/faq

Sat Nov 10 10:50:31 UTC 2012

Author: rene
Date: Sat Nov 10 10:50:31 2012
New Revision: 39971
URL: http://svnweb.freebsd.org/changeset/doc/39971

Log:
  Merge up to revision 39969

Modified:
  translations/nl_NL.ISO8859-1/books/faq/book.xml

Modified: translations/nl_NL.ISO8859-1/books/faq/book.xml
==============================================================================

--- translations/nl_NL.ISO8859-1/books/faq/book.xml	Sat Nov 10 07:33:29 2012	(r39970)
+++ translations/nl_NL.ISO8859-1/books/faq/book.xml	Sat Nov 10 10:50:31 2012	(r39971)
@@ -6,7 +6,7 @@
 	$FreeBSD$
 
 	%SOURCE%  en_US.ISO8859-1/books/faq/book.xml
-	%SRCID%	  39888
+	%SRCID%	  39969
 -->
 
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V4.2-Based Extension//EN"
@@ -1218,8 +1218,8 @@
     <qandaset>
       <qandaentry>
 	<question id="which-architecture">
-	  <para>Voor welk platform moet ik downloaden? Ik heb een Intel CPU met
-	    64-bits mogelijkheden, maar ik zie alleen
+	  <para>Voor welk platform moet ik downloaden? Ik heb een &intel; CPU
+	    met 64-bits mogelijkheden, maar ik zie alleen
 	    <literal>amd64</literal>.</para>
 	</question>
 
@@ -2176,8 +2176,8 @@
 	  </question>
 
 	  <answer>
-	    <para>Ja. &os; wekrt momenteel op de Intel x86 en de
-	      AMD64 architecturen.  De Intel EM64T, IA-64, &arm;,
+	    <para>Ja. &os; werkt momenteel op de &intel; x86 en de
+	      AMD64 architecturen.  De &intel; EM64T, IA-64, &arm;,
 	      &powerpc; en &sparc64; architecturen worden
 	      ook ondersteund.  Aankomende platformen zijn &mips;
 	      en &s390;, schrijf je in op de &a.mips; voor meer
@@ -4375,6 +4375,25 @@ kern.timecounter.hardware: TSC -> i82
 	    </para>
 	</answer>
       </qandaentry>
+
+      <qandaentry>
+	<question id="convert-back-from-pkgng">
+	  <para>Hoe kan ik teruggaan van pkgng naar de oude
+	    pakketgereedschappen?</para>
+	</question>
+
+	<answer>
+	  <para>Kort antwoord: dit is niet mogelijk.</para>
+
+	  <para>Lang antwoord: als u veranderingen heeft gemaakt met
+	    <command>pkg</command>, dan is teruggaan niet triviaal en zijn er
+	    vele handmatige wijzigingen nodig aan de interne bestanden van de
+	    pakket-database.  Als u echter net <command>pkg2ng</command> heeft
+	    gedraaid, dan kunt u <filename>/var/db/pkg/local.sqlite</filename>
+	    verwijderen en <filename>/var/backups/pkgdb.bak.tbz</filename>
+	    uitpakken.</para>
+	</answer>
+      </qandaentry>
     </qandaset>
   </chapter>
 
@@ -6955,8 +6974,8 @@ UserConfig> <userinput>quit</userinpu
 
 	    <listitem>
 	      <para><keycode>116</keycode> —
-		<keycap>Windows</keycap> key, to the right of the
-		<keycap>AltGr</keycap> key</para>
+		<keycap>Windows</keycap> key, to the right of
+		<keycap>AltGr</keycap></para>
 	    </listitem>
 
 	    <listitem>
@@ -8014,7 +8033,7 @@ add 0 0 HISADDR</programlisting>
 	    seconds of inactivity before the connection is closed.  If
 	    <replaceable>NNN</replaceable> is zero, the connection is
 	    never closed due to a timeout.  It is possible to put this
-	    command in the <filename>ppp.conf</filename> file, or to
+	    command in <filename>ppp.conf</filename>, or to
 	    type it at the prompt in interactive mode.  It is also
 	    possible to adjust it on the fly while the line is active by
 	    connecting to <application>ppp</application>'s server socket
@@ -8123,7 +8142,7 @@ add 0 0 HISADDR</programlisting>
 	  <para>There is very little you can do about this.  Most ISPs
 	    will refuse to help if you are not running a µsoft; OS.
 	    You can <literal>enable lqr</literal> in your
-	    <filename>ppp.conf</filename> file, allowing &man.ppp.8; to
+	    <filename>ppp.conf</filename>, allowing &man.ppp.8; to
 	    detect the remote failure and hang up, but this detection is
 	    relatively slow and therefore not that useful.  You may want
 	    to avoid telling your ISP that you are running
@@ -9459,11 +9478,14 @@ hint.sio.7.irq="12"</programlisting>
 	    <quote>scratch and sniff</quote> GUI.  It is a funny old
 	    business we are in!</para>
 
-	  <para>Seriously, both &os; and &linux; use the
+	  <para>Seriously, &os; uses the
 	    <acronym>HLT</acronym> (halt) instruction when the system is
 	    idle thus lowering its energy consumption and therefore the
-	    heat it generates.  Also if you have APM (advanced power
-	    management) configured, then &os; can also put the CPU into
+	    heat it generates.  Also if you have <acronym>APM</acronym>
+	    (advanced power
+	    management) or <acronym>ACPI</acronym> (Advanced
+	    Configuration and Power Interface)
+	    configured, then &os; can also put the CPU into
 	    a low power mode.</para>
 	</answer>
       </qandaentry>
@@ -9776,35 +9798,6 @@ hint.sio.7.irq="12"</programlisting>
       </qandaentry>
 
       <qandaentry>
-	<question id="makeworld-clobbers">
-	  <para>Why does
-	    <command>make <maketarget>world</maketarget></command>
-	    clobber my existing installed binaries?</para>
-	</question>
-
-	<answer>
-	  <para>Yes, this is the general idea; as its name might
-	    suggest,
-	    <command>make <maketarget>world</maketarget></command>
-	    rebuilds every system binary from scratch, so you can be
-	    certain of having a clean and consistent environment at the
-	    end (which is why it takes so long).</para>
-
-	  <para>If the environment variable <makevar>DESTDIR</makevar>
-	    is defined while running
-	    <command>make <maketarget>world</maketarget></command> or
-	    <command>make <maketarget>install</maketarget></command>,
-	    the newly-created binaries will be deposited in a directory
-	    tree identical to the installed one, rooted at
-	    <literal>${DESTDIR}</literal>.  Some random combination of
-	    shared libraries modifications and program rebuilds can
-	    cause this to fail in
-	    <command>make <maketarget>world</maketarget></command>
-	    however.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="ctm">
 	  <para>Can I follow <emphasis>-CURRENT</emphasis> with limited
 	    Internet access?</para>
