Update of untranslated files

6 files changed, 67 insertions, 20 deletions

diff --git a/nl/boot-installer/alpha.xml b/nl/boot-installer/alpha.xml
index bbb13e269..b598bcc2d 100644
--- a/nl/boot-installer/alpha.xml
+++ b/nl/boot-installer/alpha.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 40542 untranslated -->
+<!-- original version: 43789 untranslated -->
 
  <sect2 arch="alpha" id="alpha-firmware">
  <title>Alpha Console Firmware</title>
@@ -330,13 +330,26 @@ and use a console on the first serial port, you would type:
   <sect2 arch="alpha"><title>Booting from CD-ROM with the SRM Console</title>
 <para>
 
-Type
+The &debian; install CDs include several preconfigured boot options for
+VGA and serial consoles.  Type
 
 <informalexample><screen>
 &gt;&gt;&gt; boot xxxx -flags 0
 </screen></informalexample>
 
-where <replaceable>xxxx</replaceable> is your CD-ROM drive in SRM notation.
+to boot using VGA console, where <replaceable>xxxx</replaceable> is your
+CD-ROM drive in SRM notation.  To use serial console on the first 
+serial device, type
+
+<informalexample><screen>
+&gt;&gt;&gt; boot xxxx -flags 1
+</screen></informalexample>
+
+and for console on the second serial port, type
+
+<informalexample><screen>
+&gt;&gt;&gt; boot xxxx -flags 2
+</screen></informalexample>
 
 </para>
   </sect2>
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 8d4826bda..1259462c8 100644
--- a/nl/boot-installer/parameters.xml
+++ b/nl/boot-installer/parameters.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43730 untranslated -->
+<!-- original version: 43912 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -471,7 +471,8 @@ See <xref linkend="pkgsel"/> for additional information.
 
    </sect3>
 
-   <sect3 id="module-parms"><title>Passing parameters to kernel modules</title>
+   <sect3 id="module-parms">
+   <title>Passing parameters to kernel modules</title>
 <para>
 
 If drivers are compiled into the kernel, you can pass parameters to them
@@ -510,5 +511,34 @@ to use the BNC (coax) connector and IRQ 10, you would pass:
 
 </para>
    </sect3>
+
+   <sect3 id="module-blacklist">
+   <title>Blacklisting kernel modules</title>
+<para>
+
+Sometimes it may be necessary to blacklist a module to prevent it from
+being loaded automatically by the kernel and udev. One reason could be that
+a particular module causes problems with your hardware. The kernel also
+sometimes lists two different drivers for the same device. This can cause
+the device to not work correctly if the drivers conflict or if the wrong
+driver is loaded first.
+
+</para><para>
+
+You can blacklist a module using the following syntax:
+<userinput><replaceable>module_name</replaceable>.blacklist=yes</userinput>.
+This will cause the module to be blacklisted in
+<filename>/etc/modprobe.d/blacklist.local</filename> both during the
+installation and for the installed system.
+
+</para><para>
+
+Note that a module may still be loaded by the installation system itself.
+You can prevent that from happening by running the installation in expert
+mode and unselecting the module from the list of modules displayed during
+the hardware detection phases.
+
+</para>
+   </sect3>
   </sect2>
  </sect1>
diff --git a/nl/boot-installer/powerpc.xml b/nl/boot-installer/powerpc.xml
index 24aa8dfe9..2a5dc6105 100644
--- a/nl/boot-installer/powerpc.xml
+++ b/nl/boot-installer/powerpc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33886 untranslated -->
+<!-- original version: 43923 untranslated -->
 
   <sect2 arch="powerpc" id="boot-cd"><title>Booting from a CD-ROM</title>
 
@@ -8,8 +8,8 @@
 <para>
 
 Currently, the only &arch-title; subarchitectures that support CD-ROM
-booting are PReP and New World PowerMacs. On PowerMacs, hold the
-<keycap>c</keycap> key, or else the combination of
+booting are PReP (though not all systems) and New World PowerMacs.
+On PowerMacs, hold the <keycap>c</keycap> key, or else the combination of
 <keycap>Command</keycap>, <keycap>Option</keycap>,
 <keycap>Shift</keycap>, and <keycap>Delete</keycap>
 keys together while booting to boot from the CD-ROM.
@@ -189,7 +189,10 @@ boot monitor (see <xref linkend="invoking-openfirmware"/>) and
 use the command <command>boot enet:0</command>.  PReP and CHRP boxes
 may have different ways of addressing the network.  On a PReP machine,
 you should try
-<userinput>boot <replaceable>server_ipaddr</replaceable>,<replaceable>file</replaceable>,<replaceable>client_ipaddr</replaceable></userinput>.
+<userinput>boot net:<replaceable>server_ipaddr</replaceable>,<replaceable>file</replaceable>,<replaceable>client_ipaddr</replaceable></userinput>.
+On some PReP systems (e.g. Motorola PowerStack machines) the command
+<userinput>help boot</userinput> may give a description of syntax and
+available options.
 
 </para>
   </sect2>
diff --git a/nl/hardware/hardware-supported.xml b/nl/hardware/hardware-supported.xml
index 6927bc67f..e4d70db61 100644
--- a/nl/hardware/hardware-supported.xml
+++ b/nl/hardware/hardware-supported.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43640 untranslated -->
+<!-- original version: 43943 untranslated -->
 
  <sect1 id="hardware-supported">
  <title>Supported Hardware</title>
@@ -245,7 +245,7 @@ with X.Org version &x11ver;.
 </para><para arch="mips">
 
 <!-- FIXME: mention explicit graphics chips and not system names -->
-The X.Org X11 window system is only supported on the SGI Indy and the O2.  The
+The X.Org X Window System is only supported on the SGI Indy and the O2.  The
 Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v PCI
 slots and support VGA emulation or Linux framebuffer on a selected range
 of graphics cards.  A <ulink url="&url-bcm91250a-hardware;">compatibility
@@ -253,7 +253,7 @@ listing</ulink> for Broadcom evaluation boards is available.
 
 </para><para arch="mipsel">
 
-The X.Org X11 window system is supported on some DECstation models.  The
+The X.Org X Window System is supported on some DECstation models.  The
 Broadcom BCM91250A and BCM91480B evaluation boards have standard 3.3v PCI
 slots and support VGA emulation or Linux framebuffer on a selected range
 of graphics cards.  A <ulink url="&url-bcm91250a-hardware;">compatibility
diff --git a/nl/hardware/supported-peripherals.xml b/nl/hardware/supported-peripherals.xml
index 1eb8625a4..ac9d0f732 100644
--- a/nl/hardware/supported-peripherals.xml
+++ b/nl/hardware/supported-peripherals.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43696 untranslated -->
+<!-- original version: 43939 untranslated -->
 
  <sect1 id="supported-peripherals">
  <title>Peripherals and Other Hardware</title>
@@ -129,7 +129,7 @@ is that the manufacturers do not generally make the resources
 available to write a Linux driver. Generally, the hardware and
 software interface to the device is proprietary, and documentation is
 not available without a non-disclosure agreement, if it is available
-at all. This precludes its being used for free software, since free
+at all. This precludes it being used for free software, since free
 software writers disclose the source code of their programs. The
 second reason is that when devices like these have had their embedded
 processors removed, the operating system must perform the work of the
diff --git a/nl/using-d-i/modules/partman-crypto.xml b/nl/using-d-i/modules/partman-crypto.xml
index 4dfece02f..8934fb657 100644
--- a/nl/using-d-i/modules/partman-crypto.xml
+++ b/nl/using-d-i/modules/partman-crypto.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43576 untranslated -->
+<!-- original version: 43901 untranslated -->
 
    <sect3 id="partman-crypto">
    <title>Configuring Encrypted Volumes</title>
@@ -269,15 +269,16 @@ Please see the the section on erasing data above.
 
 </variablelist>
 
-</para><note><para>
+</para>
+<note condition="gtk"><para>
 
 Please note that the <emphasis>graphical</emphasis> version of the
 installer still has some limitations when compared to the textual
-one. For cryptography it means you can set up only volumes using
-<emphasis>passphrases</emphasis> as the encryption keys.
-
-</para></note><para>
+one. For cryptography it means you can set up only volumes using a
+<emphasis>passphrase</emphasis> as the encryption key.
 
+</para></note>
+<para>
 
 After you have selected the desired parameters for your encrypted
 partitions, return back to the main partitioning menu. There should