- Change default build to Etch.

- Remove all Sarge specific content and make Etch specific content default.
- Delete some obsolete entities.

9 files changed, 8 insertions, 138 deletions

diff --git a/en/using-d-i/components.xml b/en/using-d-i/components.xml
index ff023a345..8d58adf72 100644
--- a/en/using-d-i/components.xml
+++ b/en/using-d-i/components.xml
@@ -40,8 +40,6 @@ hardware detection needs to be repeated later in the process.
 </para>
 
 &module-lowmem.xml;
-&module-languagechooser.xml;
-&module-countrychooser.xml;
 &module-localechooser.xml;
 &module-kbd-chooser.xml;
 &module-s390-netdevice.xml;
diff --git a/en/using-d-i/modules/countrychooser.xml b/en/using-d-i/modules/countrychooser.xml
deleted file mode 100644
index dd767b701..000000000
--- a/en/using-d-i/modules/countrychooser.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
-
-   <sect3 id="country-chooser" condition="sarge">
-   <title>Country selection</title>
-
-<para>
-
-If you selected a language in <xref linkend="lang-chooser"/> which has
-more than one country associated with it (true for Chinese, English,
-French, and many other languages), you can specify the country here.
-If you choose <guimenuitem>Other</guimenuitem> at the bottom of the list,
-you will be presented with a list of all countries, grouped by continent.
-
-</para><para>
-
-This selection will be used later in the installation process to pick the
-default timezone and a Debian mirror appropriate for your geographic
-location. If the defaults proposed by the installer are not suitable, you
-can make a different choice. The selected country, together with the selected
-language, may also affect locale settings for your new Debian system.
-
-</para>
-   </sect3>
diff --git a/en/using-d-i/modules/languagechooser.xml b/en/using-d-i/modules/languagechooser.xml
deleted file mode 100644
index c0cc95c39..000000000
--- a/en/using-d-i/modules/languagechooser.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- retain these comments for translator revision tracking -->
-<!-- $Id$ -->
-
-
-   <sect3 id="lang-chooser" condition="sarge">
-   <title>Language selection</title>
-
-<para>
-
-As the first step of the installation, select the language in which
-you want the installation process to proceed. The language names
-are listed in both English (left side) and in the language itself
-(right side); the names on the right side are also shown in the proper
-script for the language. The list is sorted on the English names.
-
-</para><para>
-
-The language you choose will be used for the rest of the installation
-process, provided a translation of the different dialogs is available.
-If no valid translation is available for the selected language, the
-installer will default to English. The selected language will also be
-used to help select a suitable keyboard layout.
-
-</para>
-   </sect3>
diff --git a/en/using-d-i/modules/localechooser.xml b/en/using-d-i/modules/localechooser.xml
index d17dd4dcb..c867a606f 100644
--- a/en/using-d-i/modules/localechooser.xml
+++ b/en/using-d-i/modules/localechooser.xml
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 
 
-   <sect3 id="localechooser" condition="etch">
+   <sect3 id="localechooser">
    <title>Selecting Localization Options</title>
 
 <para>
diff --git a/en/using-d-i/modules/lvmcfg.xml b/en/using-d-i/modules/lvmcfg.xml
index 19b77f53c..6d7fae931 100644
--- a/en/using-d-i/modules/lvmcfg.xml
+++ b/en/using-d-i/modules/lvmcfg.xml
@@ -47,43 +47,6 @@ volume groups (VG)</guimenuitem> menu. After that, you should create
 logical volumes on the top of volume groups from the menu
 <guimenuitem>Modify logical volumes (LV)</guimenuitem>.
 
-<note arch="powerpc" condition="sarge"><para>
-
-There is no widely accepted standard to identify partitions containing
-LVM data on Apple Power Macintosh hardware. On this particular
-hardware, the above procedure for creating physical volumes and volume
-groups will not work. There is a good workaround for this limitation,
-provided you are familiar with the underlying LVM tools.
-
-</para><para>
-
-To install using logical volumes on Power Macintosh hardware you
-should create all the disk partitions for your logical volumes as
-usual. In the <guimenu>Partition settings</guimenu> menu you should
-choose <menuchoice><guimenu>Use as:</guimenu> <guimenuitem>Do Not
-Use</guimenuitem></menuchoice> for these partitions (you will not be
-offered the option to use the partition as a physical volume). When
-you are done with creating all your partitions, you should start the
-logical volume manager as usual. However, since no physical volumes
-have been created you must now access the command shell available on
-the second virtual terminal (see <xref linkend="shell"/>) and create
-them manually.
-
-</para><para>
-
-Use the <command>pvcreate</command> command at the shell command prompt
-to create a physical volume on each of your chosen partitions. Then use
-the <command>vgcreate</command> command to create each volume group
-you want. You can safely ignore any errors about incorrect metadata
-area header checksums and fsync failures while doing this. When you
-have finished creating all your volume groups, you should go back to
-the first virtual terminal and skip directly to the
-<command>lvmcfg</command> menu items for logical volume
-management. You will see your volume groups and you can create the
-logical volumes you need as usual.
-
-</para></note>
-
 </para><para>
 
 After returning from <command>lvmcfg</command> back to
diff --git a/en/using-d-i/modules/mdcfg.xml b/en/using-d-i/modules/mdcfg.xml
index 6365a3fa1..e39e403bb 100644
--- a/en/using-d-i/modules/mdcfg.xml
+++ b/en/using-d-i/modules/mdcfg.xml
@@ -146,14 +146,6 @@ To sum it up:
 If you want to know the whole truth about Software RAID, have a look
 at <ulink url="&url-software-raid-howto;">Software RAID HOWTO</ulink>.
 
-<note arch="powerpc" condition="sarge"><para>
-
-There is no widely accepted standard to identify partitions containing
-RAID data on Apple Power Macintosh hardware. This means that &d-i;
-currently does not support setting up RAID on this platform.
-
-</para></note>
-
 </para><para>
 
 To create a MD device, you need to have the desired partitions it
diff --git a/en/using-d-i/modules/os-prober.xml b/en/using-d-i/modules/os-prober.xml
index 03aa06176..43c761c04 100644
--- a/en/using-d-i/modules/os-prober.xml
+++ b/en/using-d-i/modules/os-prober.xml
@@ -23,15 +23,4 @@ boot manager's documentation for more information.
 <!-- TODO: Maybe include some arch-dependent tables with supported OS'es here -->
 
 </para>
-
-<note condition="sarge"><para>
-
-The installer may fail to detect other operating systems if the partitions on
-which they reside are mounted when the detection takes place. This may occur if
-you select a mountpoint (e.g. /win) for a partition containing another operating
-system in <command>partman</command>, or if you have mounted partitions manually
-from a console.
-
-</para></note>
-
    </sect3>
diff --git a/en/using-d-i/modules/save-logs.xml b/en/using-d-i/modules/save-logs.xml
index a930db4fa..2addf18a3 100644
--- a/en/using-d-i/modules/save-logs.xml
+++ b/en/using-d-i/modules/save-logs.xml
@@ -14,9 +14,8 @@ Debian system.
 </para><para>
 
 Choosing <guimenuitem>Save debug logs</guimenuitem> from the main
-menu allows you to save the log files to a floppy
-disk<phrase condition="etch">, network, hard disk, or other
-media</phrase>. This can be useful if you encounter fatal problems
+menu allows you to save the log files to a floppy disk, network, hard
+disk, or other media. This can be useful if you encounter fatal problems
 during the installation and wish to study the logs on another system
 or attach them to an installation report.
 
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index 97e142b84..51cb4bcd5 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -132,27 +132,7 @@ repeatedly to back all the way out of the currently running component.
 
 </para></listitem>
 </varlistentry>
-<varlistentry condition="sarge">
-
-<term>languagechooser</term><listitem><para>
-
-Shows a list of languages and language variants. The installer will
-display messages in the chosen language, unless the translation for
-that language is not complete. When a translation is not complete,
-English messages are shown.
-
-</para></listitem>
-</varlistentry>
-<varlistentry condition="sarge">
-
-<term>countrychooser</term><listitem><para>
-
-Shows a list of countries. The user may choose the country he lives
-in.
-
-</para></listitem>
-</varlistentry>
-<varlistentry condition="etch">
+<varlistentry>
 
 <term>localechooser</term><listitem><para>
 
@@ -389,12 +369,11 @@ console.
 </varlistentry>
 <varlistentry>
 
-<term condition="sarge">bugreporter</term><term condition="etch">save-logs</term><listitem><para>
+<term>save-logs</term><listitem><para>
 
-Provides a way for the user to record information on a floppy
-disk<phrase condition="etch">, network, hard disk, or other media</phrase>
-when trouble is encountered, in order to accurately report installer
-software problems to Debian developers later.
+Provides a way for the user to record information on a floppy disk, network,
+hard disk, or other media when trouble is encountered, in order to accurately
+report installer software problems to Debian developers later.
 
 </para></listitem>
 </varlistentry>