Update of original English documents

3 files changed, 5 insertions, 75 deletions

diff --git a/fi/install-methods/automatic-install.xml b/fi/install-methods/automatic-install.xml
index 48c4970f0..9410b23fe 100644
--- a/fi/install-methods/automatic-install.xml
+++ b/fi/install-methods/automatic-install.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 32424 untranslated -->
+<!-- original version: 33725 untranslated -->
 
  <sect1 id="automatic-install">
  <title>Automatic Installation</title>
@@ -24,76 +24,11 @@ files. A preconfiguration file can be loaded from the network or from
 removable media, and used to fill in answers to questions asked during the
 installation process.
 
-</para><para condition="etch">
+</para><para>
 
 Full documentation on preseeding including a working example that you can
 edit is in <xref linkend="appendix-preseed"/>.
 
-</para><para condition="sarge">
-
-Although most dialogs used by &d-i; can be preseeded using this method,
-there are some notable exceptions. You can (re)partition an entire disk
-or use available free space on a disk; it is not possible to use existing
-partitions. You currently cannot use preseeding to set up RAID and LVM.
-Also, with the exception of network driver modules, it is not possible
-to preconfigure kernel module parameters.
-
-</para><para condition="sarge">
-
-The preconfiguration file is in the format used by the
-debconf-set-selections command. A well documented and working example
-that you can edit is in <xref linkend="example-preseed"/>.
-
-</para><para condition="sarge">
-
-Alternatively, one way to get a complete file listing
-all the values that can be preseeded is to do a manual install,
-and then use <filename>debconf-get-selections</filename>,
-from the <classname>debconf-utils</classname> package,
-to dump both the debconf database and the cdebconf
-database in /var/log/debian-installer/cdebconf to a single file:
-
-<informalexample><screen>
-$ debconf-get-selections --installer &gt; <replaceable>file</replaceable>
-$ debconf-get-selections &gt;&gt; <replaceable>file</replaceable>
-</screen></informalexample>
-
-However, a file generated in this manner will have some items that should
-not be preseeded, and the file in <xref linkend="example-preseed"/> is a
-better starting place for most users.
-
-</para><para condition="sarge">
-
-Once you have a preconfiguration file, you can edit it if necessary, and
-place it on a web server, or copy it onto the installer's boot media. Wherever
-you place the file, you need to pass a parameter to the installer at boot
-time to tell it to use the file.
-
-</para><para condition="sarge">
-
-To make the installer use a preconfiguration file downloaded from the
-network, add preseed/url=http://url/to/preseed.cfg to the kernel boot
-parameters. Of course the preconfiguration will not take effect until the
-installer manages to set up the network to download the file, so this is
-most useful if the installer can set up the network via DHCP without asking
-any questions. You may want to set the installation priority to critical to
-avoid any questions while the network is being configured. See
-<xref linkend="installer-args"/>.
-
-</para><para condition="sarge">
-
-To place a preconfiguration file on a CD, you would need to remaster the
-ISO image to include your preconfiguration file. See the manual page for
-mkisofs for details. Alternatively, put the preseed file on a floppy, and
-use preseed/file=/floppy/preseed.cfg
-
-</para><para arch="i386" condition="sarge">
-
-If you'll be booting from a USB memory stick, then you can simply copy your
-preconfiguration file onto the memory stick's filesystem, and edit the
-syslinux.cfg file to add preseed/file=/hd-media/preseed.cfg to the kernel boot
-parameters.
-
 </para>
   </sect2>
  </sect1>
diff --git a/fi/install-methods/usb-setup/i386.xml b/fi/install-methods/usb-setup/i386.xml
index 9355ee888..220f69dae 100644
--- a/fi/install-methods/usb-setup/i386.xml
+++ b/fi/install-methods/usb-setup/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 32141 untranslated -->
+<!-- original version: 33725 untranslated -->
 
    <sect3 arch="i386">
    <title>USB stick partitioning on &arch-title;</title>
@@ -92,10 +92,6 @@ append initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw
 
 Please note that the <userinput>ramdisk_size</userinput> parameter
 may need to be increased, depending on the image you are booting.
-<phrase condition="sarge">
-If the boot fails, you can try adding <userinput>devfs=mount,dall</userinput>
-to the <quote>append</quote> line.
-</phrase>
 
 </para>
    </sect3>
diff --git a/fi/install-methods/usb-setup/powerpc.xml b/fi/install-methods/usb-setup/powerpc.xml
index 36c572fa4..fc64d7eb6 100644
--- a/fi/install-methods/usb-setup/powerpc.xml
+++ b/fi/install-methods/usb-setup/powerpc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 27345 untranslated -->
+<!-- original version: 33725 untranslated -->
 
    <sect3 arch="powerpc">
    <title>USB stick partitioning on &arch-title;</title>
@@ -99,8 +99,7 @@ message=/boot.msg
 image=/vmlinux
         label=install
         initrd=/initrd.gz
-        initrd-size=10000<phrase condition="sarge">
-        append="devfs=mount,dall --"</phrase>
+        initrd-size=10000
         read-only
 </screen></informalexample>