It does not look like we'll be updating the installation guide for Etch, so remove all the release conditions

10 files changed, 28 insertions, 118 deletions

diff --git a/en/appendix/graphical.xml b/en/appendix/graphical.xml
index 62bd1e61a..f2ccdf141 100644
--- a/en/appendix/graphical.xml
+++ b/en/appendix/graphical.xml
@@ -37,9 +37,8 @@ image<footnote id="gtk-miniiso">
 
 <para>
 The mini ISO image can be downloaded from a Debian mirror as described
-in <xref linkend="downloading-files"/>. Look for
-<phrase condition="etch"><filename>gtk-miniiso</filename></phrase>
-<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>.
+in <xref linkend="downloading-files"/>.
+Look for <filename>netboot/gtk/mini.iso</filename>.
 </para>
 
 </footnote>, which is mainly useful for testing; in this case the image is
@@ -53,9 +52,8 @@ image is available<footnote id="gtk-miniiso">
 
 <para>
 The mini ISO image can be downloaded from a Debian mirror as described
-in <xref linkend="downloading-files"/>. Look for
-<phrase condition="etch"><filename>gtk-miniiso</filename></phrase>
-<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>.
+in <xref linkend="downloading-files"/>.
+Look for <filename>netboot/gtk/mini.iso</filename>.
 </para>
 
 </footnote>. It should work on almost all PowerPC systems that have
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index ef53a27df..3ca19797c 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -844,9 +844,8 @@ same as <classname>mirror/suite</classname>.
 
 <informalexample role="example"><screen>
 # If you select ftp, the mirror/country string does not need to be set.
-#d-i mirror/protocol string ftp<phrase condition="etch">
-d-i mirror/country string enter information manually</phrase><phrase condition="lenny">
-d-i mirror/country string manual</phrase>
+#d-i mirror/protocol string ftp
+d-i mirror/country string manual
 d-i mirror/http/hostname string &archive-mirror;
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
@@ -886,17 +885,13 @@ correct one will be selected before using preseeding.
 #d-i partman-auto/init_automatically_partition \
 #      select Guided - use the largest continuous free space
 
-<phrase condition="etch"># Alternatively, you can specify a disk to partition. The device name
-# can be given in either devfs or traditional non-devfs format.
-# For example, to use the first disk:
-d-i partman-auto/disk string /dev/discs/disc0/disc</phrase><phrase condition="lenny">
 # Alternatively, you can specify a disk to partition. The device name must
 # be given in traditional non-devfs format.
 # For example, to use the first SCSI/SATA hard disk:
 d-i partman-auto/disk string /dev/sda
 # Note: If you want to use whatever disk is available, no matter
 # what its device name, comment the line above out. This will only work if
-# the system only has one disk.</phrase>
+# the system only has one disk.
 # In addition, you'll need to specify the method to use.
 # The presently available methods are: "regular", "lvm" and "crypto"
 d-i partman-auto/method string lvm
@@ -1039,13 +1034,12 @@ d-i clock-setup/utc boolean true
 
 # You may set this to any valid setting for $TZ; see the contents of
 # /usr/share/zoneinfo/ for valid values.
-d-i time/zone string US/Eastern<phrase condition="lenny">
+d-i time/zone string US/Eastern
 
 # Controls whether to use NTP to set the clock during the install
 d-i clock-setup/ntp boolean true
 # NTP server to use. The default is almost always fine here.
 #d-i clock-setup/ntp-server ntp.example.com
-</phrase>
 </screen></informalexample>
 
   </sect2>
@@ -1091,11 +1085,11 @@ MD5 hash allows for brute force attacks.
 # or encrypted using an MD5 hash.
 #d-i passwd/user-password-crypted password [MD5 hash]
 # Create the first user with the specified UID instead of the default.
-#d-i passwd/user-uid string 1010<phrase condition="lenny">
+#d-i passwd/user-uid string 1010
 
 # The user account will be added to some standard initial groups. To
 # override that, use this.
-#d-i passwd/user-default-groups string audio cdrom video</phrase>
+#d-i passwd/user-default-groups string audio cdrom video
 </screen></informalexample>
 
 <para>
@@ -1130,11 +1124,11 @@ installation. The only questions asked concern the installation of the kernel.
 
 <informalexample role="example"><screen>
 # Select the initramfs generator used to generate the initrd for 2.6 kernels.
-#d-i base-installer/kernel/linux/initramfs-generators string yaird<phrase condition="lenny">
+#d-i base-installer/kernel/linux/initramfs-generators string yaird
 
 # The kernel image (meta) package to be installed; "none" can be used if no
 # kernel is to be installed.
-#d-i base-installer/kernel/image linux-image-2.6-486</phrase>
+#d-i base-installer/kernel/image linux-image-2.6-486
 </screen></informalexample>
 
   </sect2>
@@ -1154,15 +1148,12 @@ earlier questions. You can optionally add other (local) repositories.
 #d-i apt-setup/non-free boolean true
 #d-i apt-setup/contrib boolean true
 # Uncomment this if you don't want to use a network mirror.
-#d-i apt-setup/use_mirror boolean false<phrase condition="etch">
-# Uncomment this to avoid adding security sources, or
-# add a hostname to use a different server than security.debian.org.
-#d-i apt-setup/security_host string</phrase><phrase condition="lenny">
+#d-i apt-setup/use_mirror boolean false
 # Select which update services to use; define the mirrors to be used.
 # Values shown below are the normal defaults.
 #d-i apt-setup/services-select multi-select security, volatile
 #d-i apt-setup/security_host string security.debian.org
-#d-i apt-setup/volatile_host string volatile.debian.org</phrase>
+#d-i apt-setup/volatile_host string volatile.debian.org
 
 # Additional repositories, local[0-9] available
 #d-i apt-setup/local0/repository string \
@@ -1245,11 +1236,10 @@ to be used easily on the kernel command line as well.
 </para>
 
 <informalexample role="example"><screen>
-#tasksel tasksel/first multiselect standard, web-server<phrase condition="lenny">
+#tasksel tasksel/first multiselect standard, web-server
 # If the desktop task is selected, install the kde and xfce desktops
 # instead of the default gnome desktop.
-#tasksel tasksel/desktop multiselect kde, xfce</phrase><phrase condition="etch">
-#tasksel tasksel/first multiselect standard, kde-desktop</phrase>
+#tasksel tasksel/desktop multiselect kde, xfce
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
@@ -1269,10 +1259,10 @@ to be used easily on the kernel command line as well.
 <informalexample role="example"><screen>
 # Grub is the default boot loader (for x86). If you want lilo installed
 # instead, uncomment this:
-#d-i grub-installer/skip boolean true<phrase condition="lenny">
+#d-i grub-installer/skip boolean true
 # To also skip installing lilo, and install no bootloader, uncomment this
 # too:
-#d-i lilo-installer/skip boolean true</phrase>
+#d-i lilo-installer/skip boolean true
 
 # This is fairly safe to set, it makes grub install automatically to the MBR
 # if no other operating system is detected on the machine.
diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index 8c9714506..d9928a639 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -205,7 +205,7 @@ one device.
 </para></listitem>
 </varlistentry>
 
-<varlistentry condition="lenny">
+<varlistentry>
 <term>lowmem</term>
 <listitem><para>
 
@@ -297,7 +297,7 @@ this misbehavior.
 </para></listitem>
 </varlistentry>
 
-<varlistentry condition="lenny">
+<varlistentry>
 <term>disk-detect/dmraid/enable (dmraid)</term>
 <listitem><para>
 
diff --git a/en/hardware/hardware-supported.xml b/en/hardware/hardware-supported.xml
index ac4e6ce6c..ca26f0aaf 100644
--- a/en/hardware/hardware-supported.xml
+++ b/en/hardware/hardware-supported.xml
@@ -63,10 +63,8 @@ variations of each architecture known as <quote>flavors</quote>.
 </row>
 
 <row>
-  <entry morerows="3" condition="etch">ARM and StrongARM</entry>
-  <entry morerows="2" condition="lenny">ARM and StrongARM</entry>
-  <entry morerows="3" condition="etch">arm</entry>
-  <entry morerows="2" condition="lenny">arm</entry>
+  <entry morerows="2">ARM and StrongARM</entry>
+  <entry morerows="2">arm</entry>
   <entry>Netwinder and CATS</entry>
   <entry>netwinder</entry>
 </row><row>
@@ -75,9 +73,6 @@ variations of each architecture known as <quote>flavors</quote>.
 </row><row>
   <entry>Intel IXP4xx</entry>
   <entry>ixp4xx</entry>
-</row><row condition="etch">
-  <entry>RiscPC</entry>
-  <entry>rpc</entry>
 </row>
 
 <row>
@@ -164,14 +159,9 @@ variations of each architecture known as <quote>flavors</quote>.
   <entry>prep</entry>
 </row>
 
-<row condition="etch">
-  <entry morerows="2">Sun SPARC</entry>
-  <entry morerows="2">sparc</entry>
-  <entry>sun4m</entry>
-  <entry>sparc32</entry>
-</row><row>
-  <entry morerows="1" condition="lenny">Sun SPARC</entry>
-  <entry morerows="1" condition="lenny">sparc</entry>
+<row>
+  <entry morerows="1">Sun SPARC</entry>
+  <entry morerows="1">sparc</entry>
   <entry>sun4u</entry>
   <entry morerows="1">sparc64</entry>
 </row><row>
diff --git a/en/hardware/installation-media.xml b/en/hardware/installation-media.xml
index 058edf8a4..09341ccac 100644
--- a/en/hardware/installation-media.xml
+++ b/en/hardware/installation-media.xml
@@ -77,7 +77,6 @@ console, see the <ulink url="&url-srm-howto;">SRM HOWTO</ulink>.
 </para><para arch="arm">
 
 IDE/ATAPI CD-ROMs are supported on all ARM machines.
-<phrase condition="etch">On RiscPCs, SCSI CD-ROMs are also supported.</phrase>
 
 </para><para arch="mips">
 
diff --git a/en/hardware/supported/arm.xml b/en/hardware/supported/arm.xml
index 4169d52b7..76eb01027 100644
--- a/en/hardware/supported/arm.xml
+++ b/en/hardware/supported/arm.xml
@@ -70,23 +70,6 @@ url="&url-arm-cyrius-nslu2;">installation instructions</ulink>.
 </para></listitem>
 </varlistentry>
 
-<varlistentry condition="etch">
-<term>RiscPC</term>
-<listitem><para>
-
-This machine is the oldest supported hardware but support for it in
-our new installer is incomplete.
-It has RISC OS in ROM, Linux can be booted from that OS using
-linloader. The RiscPC has a modular CPU card and typically has a 30MHz
-610, 40MHz 710 or 233MHz Strongarm 110 CPU fitted. The mainboard has
-integrated IDE, SVGA video, parallel port, single serial port, PS/2
-keyboard and proprietary mouse port. The proprietary module expansion
-bus allows for up to eight expansion cards to be fitted depending on
-configuration, several of these modules have Linux drivers.
-
-</para></listitem>
-</varlistentry>
-
 </variablelist>
 
 </para>
diff --git a/en/hardware/supported/sparc.xml b/en/hardware/supported/sparc.xml
index 3e83fddac..196b4a1dc 100644
--- a/en/hardware/supported/sparc.xml
+++ b/en/hardware/supported/sparc.xml
@@ -13,40 +13,7 @@ level of support may be expected for each of them.
 </para>
 
 <variablelist>
-<varlistentry condition="etch">
-<term>sun4, sun4c, sun4d</term>
-
-<listitem><para>
-
-These subarchitectures include some very old 32-bit machines, which are
-no longer supported. For a complete list please consult the
-<ulink url="http://en.wikipedia.org/wiki/SPARCstation">Wikipedia
-SPARCstation page</ulink>.
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry condition="etch">
-<term>sun4m</term>
-
-<listitem><para>
-
-sun4m is the only 32-bit subarchitecture (sparc32) that is currently
-supported. The most popular machines belonging to this class are
-Sparcstation 4, 5, 10 and 20.
-
-</para><para>
-
-Note that symmetric multiprocessing (SMP) &mdash; the ability to run
-processes on multiple processors &mdash; is not supported on this hardware,
-due to stability problems with such configurations. The available
-uniprocessor (UP) sparc32 kernel will boot fine on multiprocessor
-machines, although it will activate and use only the first CPU.
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry condition="lenny">
+<varlistentry>
 <term>sun4, sun4c, sun4d, sun4m</term>
 
 <listitem><para>
diff --git a/en/install-methods/download/arm.xml b/en/install-methods/download/arm.xml
index 4df266b22..3192b540d 100644
--- a/en/install-methods/download/arm.xml
+++ b/en/install-methods/download/arm.xml
@@ -2,19 +2,6 @@
 <!-- $Id$ -->
 
 
-   <sect3 arch="arm" condition="etch" id="riscpc-install-files">
-   <title>RiscPC Installation Files</title>
-<para>
-
-The RiscPC installer is booted initially from RISC OS.  All the
-necessary files are provided in one Zip archive, &rpc-install-kit;.
-Download this file onto the RISC OS machine, copy the
-<filename>linloader.!Boot</filename> components into place, and run
-<filename>!dInstall</filename>.
-
-</para>
-   </sect3>
-
    <sect3 arch="arm" id="netwinder-install-files">
    <title>Netwinder Installation Files</title>
 <para>
diff --git a/en/using-d-i/modules/lowmem.xml b/en/using-d-i/modules/lowmem.xml
index d24a4e15d..7d7331e37 100644
--- a/en/using-d-i/modules/lowmem.xml
+++ b/en/using-d-i/modules/lowmem.xml
@@ -52,7 +52,7 @@ larger swap doesn't help, try creating the file system as ext2 (which
 is an essential component of the installer) instead. It is possible to
 change an ext2 partition to ext3 after the installation.
 
-</para><para condition="lenny">
+</para><para>
 
 It is possible to force the installer to use a higher lowmem level than
 the one based on available memory by using the boot parameter
diff --git a/en/using-d-i/modules/x86/lilo-installer.xml b/en/using-d-i/modules/x86/lilo-installer.xml
index b2a1250f4..730b162a7 100644
--- a/en/using-d-i/modules/x86/lilo-installer.xml
+++ b/en/using-d-i/modules/x86/lilo-installer.xml
@@ -49,11 +49,7 @@ loader.
 
 Useful for advanced users who want to install <command>LILO</command>
 somewhere else. In this case you will be asked for desired
-location. You can use
-<phrase condition="etch">devfs style names, such as those that start with
-<filename>/dev/ide</filename>, <filename>/dev/scsi</filename>, and
-<filename>/dev/discs</filename>, as well as traditional names,</phrase>
-<phrase condition="lenny">traditional device names</phrase> such as
+location. You can use traditional device names such as
 <filename>/dev/hda</filename> or <filename>/dev/sda</filename>.
 
 </para></listitem></varlistentry>