Update of original English docs

5 files changed, 35 insertions, 26 deletions

diff --git a/fi/appendix/files.xml b/fi/appendix/files.xml
index 555a6395b..ad7332bf8 100644
--- a/fi/appendix/files.xml
+++ b/fi/appendix/files.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 33887 untranslated -->
 
 
  <sect1 id="linuxdevices"><title>Linux Devices</title>
@@ -153,7 +153,7 @@ to the 3-Button Mouse mini-Howto at
 <filename>/usr/share/doc/HOWTO/en-txt/mini/3-Button-Mouse.gz</filename>,
 <userinput>man gpm</userinput>,
 <filename>/usr/share/doc/gpm/FAQ.gz</filename>, and
-<ulink url="&url-xfree86;current/mouse.html">README.mouse</ulink>.
+<ulink url="&url-xorg;current/doc/html/mouse.html">README.mouse</ulink>.
 
 </para><para arch="powerpc">
 
diff --git a/fi/appendix/preseed.xml b/fi/appendix/preseed.xml
index dd3d5031e..554ccb653 100644
--- a/fi/appendix/preseed.xml
+++ b/fi/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33865 untranslated -->
+<!-- original version: 33891 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -123,7 +123,7 @@ also already have been processed.
 </para><para>
 
 Obviously, any questions that have been processed before the
-preseeding configuration file is loaded, cannot be preseeded.
+preseeding configuration file is loaded cannot be preseeded.
 <xref linkend="preseed-bootparms"/> offers a way to avoid these
 questions being asked.
 
@@ -207,7 +207,7 @@ are stored in a separate, non-readable file in the same directory.
   <title>Running custom commands during the installation</title>
 <para>
 
-A very powerfull and flexible option offered by the preseeding tools is the
+A very powerful and flexible option offered by the preseeding tools is the
 ability to run commands or scripts at certain points in the installation.
 See <xref linkend="preseed-shell"/> for details.
 
@@ -489,6 +489,12 @@ booting from CD or USB stick. If you are loading preseed files from
 the network, you can pass network config parameters in using kernel
 boot parameters.
 
+</para><para>
+
+If you need to pick a particular interface when netbooting before loading
+a preseed file from the network, use a boot parameter such as
+<userinput>netcfg/choose_interface=<replaceable>eth1</replaceable></userinput>.
+
 </para>
 
 <informalexample role="example"><screen>
@@ -496,6 +502,9 @@ boot parameters.
 # skip displaying a list if there is more than one interface.
 d-i netcfg/choose_interface select auto
 
+# To pick a particular interface instead:
+#d-i netcfg/choose_interface select eth1
+
 # If you have a slow dhcp server and the installer times out waiting for
 # it, this might be useful.
 #d-i netcfg/dhcp_timeout string 60
@@ -526,7 +535,7 @@ d-i netcfg/wireless_wep string
   <title>Mirror settings</title>
 <para>
 
-Depending on the installation method you use, a mirror may used both to
+Depending on the installation method you use, a mirror may be used both to
 download additional components of the installer, the base system and to
 set up the <filename>/etc/apt/sources.list</filename> for the installed
 system.
@@ -879,23 +888,23 @@ configurator does not do fully automatic configuration of everything.
 <informalexample role="example"><screen>
 # X can detect the right driver for some cards, but if you're preseeding,
 # you override whatever it chooses. Still, vesa will work most places.
-#xserver-xfree86 xserver-xfree86/config/device/driver select vesa
+#xserver-xorg xserver-xorg/config/device/driver select vesa
 
 # A caveat with mouse autodetection is that if it fails, X will retry it
 # over and over. So if it's preseeded to be done, there is a possibility of
 # an infinite loop if the mouse is not autodetected.
-#xserver-xfree86 xserver-xfree86/autodetect_mouse boolean true
+#xserver-xorg xserver-xorg/autodetect_mouse boolean true
 
 # Monitor autodetection is recommended.
-xserver-xfree86 xserver-xfree86/autodetect_monitor boolean true
+xserver-xorg xserver-xorg/autodetect_monitor boolean true
 # Uncomment if you have an LCD display.
-#xserver-xfree86 xserver-xfree86/config/monitor/lcd boolean true
+#xserver-xorg xserver-xorg/config/monitor/lcd boolean true
 # X has three configuration paths for the monitor. Here's how to preseed
 # the "medium" path, which is always available. The "simple" path may not
 # be available, and the "advanced" path asks too many questions.
-xserver-xfree86 xserver-xfree86/config/monitor/selection-method \
+xserver-xorg xserver-xorg/config/monitor/selection-method \
        select medium
-xserver-xfree86 xserver-xfree86/config/monitor/mode-list \
+xserver-xorg xserver-xorg/config/monitor/mode-list \
        select 1024x768 @ 60 Hz
 </screen></informalexample>
 
diff --git a/fi/boot-installer/i386.xml b/fi/boot-installer/i386.xml
index ab9e91b25..709718c2b 100644
--- a/fi/boot-installer/i386.xml
+++ b/fi/boot-installer/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33725 untranslated -->
+<!-- original version: 33886 untranslated -->
 
   <sect2 arch="i386"><title>Booting from a CD-ROM</title>
 
@@ -192,7 +192,7 @@ or <command>LILO</command>.
 </para>
   </sect2>
 
-  <sect2 arch="i386" id="usb-boot">
+  <sect2 arch="i386" condition="bootable-usb" id="usb-boot">
   <title>Booting from USB Memory Stick</title>
 <para>
 
@@ -203,7 +203,7 @@ computer.  The system should boot up, and you should be presented with
 the <prompt>boot:</prompt> prompt.  Here you can enter optional boot
 arguments, or just hit &enterkey;.
 
-</para><para>
+</para><para condition="supports-floppy-boot">
 
 In case your computer doesn't support booting from USB memory devices,
 you can still use a single floppy to do the initial boot and then
@@ -215,7 +215,7 @@ When it asks for the root floppy, simply press &enterkey;. You should see
 </para>
   </sect2>
 
-  <sect2 arch="i386" id="floppy-boot">
+  <sect2 arch="i386" condition="supports-floppy-boot" id="floppy-boot">
   <title>Booting from Floppies</title>
 <para>
 
diff --git a/fi/boot-installer/powerpc.xml b/fi/boot-installer/powerpc.xml
index 214c176d4..24aa8dfe9 100644
--- a/fi/boot-installer/powerpc.xml
+++ b/fi/boot-installer/powerpc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 33886 untranslated -->
 
   <sect2 arch="powerpc" id="boot-cd"><title>Booting from a CD-ROM</title>
 
@@ -111,7 +111,7 @@ doesn't work. The Debian installation program should start.
    </sect3>
   </sect2>
 
-  <sect2 arch="powerpc" id="usb-boot">
+  <sect2 arch="powerpc" condition="bootable-usb" id="usb-boot">
   <title>Booting from USB memory stick</title>
 <para>
 
@@ -195,7 +195,7 @@ you should try
   </sect2>
 
 
-  <sect2 arch="powerpc">
+  <sect2 arch="powerpc" condition="supports-floppy-boot">
   <title>Booting from Floppies</title>
 <para>
 
diff --git a/fi/hardware/hardware-supported.xml b/fi/hardware/hardware-supported.xml
index 43bae3a81..48a47becb 100644
--- a/fi/hardware/hardware-supported.xml
+++ b/fi/hardware/hardware-supported.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 33887 untranslated -->
 
  <sect1 id="hardware-supported">
  <title>Supported Hardware</title>
@@ -226,15 +226,15 @@ during the installation process described in this document.
 </para><para>
 
 Debian's support for graphical interfaces is determined by the
-underlying support found in XFree86's X11 system.  Most AGP, PCI and
-PCIe video cards work under XFree86.  Details on supported graphics
+underlying support found in X.Org's X11 system.  Most AGP, PCI and
+PCIe video cards work under X.Org.  Details on supported graphics
 buses, cards, monitors, and pointing devices can be found at
-<ulink url="&url-xfree86;"></ulink>.  Debian &release; ships
-with XFree86 version &x11ver;.
+<ulink url="&url-xorg;"></ulink>.  Debian &release; ships
+with X.Org version &x11ver;.
 
 </para><para arch="mips">
 
-The XFree86 X11 window system is only supported on the SGI Indy.  The
+The X.Org X11 window system is only supported on the SGI Indy.  The
 Broadcom BCM91250A evaluation board has standard 3.3v PCI slots and supports
 VGA emulation or Linux framebuffer on a selected range of graphics cards.
 A <ulink url="&url-bcm91250a-hardware;">compatibility listing</ulink> for
@@ -242,7 +242,7 @@ the BCM91250A is available.
 
 </para><para arch="mipsel">
 
-The XFree86 X11 window system is supported on some DECstation models.  The
+The X.Org X11 window system is supported on some DECstation models.  The
 Broadcom BCM91250A evaluation board has standard 3.3v PCI slots and supports
 VGA emulation or Linux framebuffer on a selected range of graphics cards.
 A <ulink url="&url-bcm91250a-hardware;">compatibility listing</ulink> for