From 70bad074da8c3e7adeb7c4747c89daa807941a0c Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Tue, 3 Jan 2006 18:17:58 +0000
Subject: merge in ex-base-config branch

---
 en/using-d-i/components.xml | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

(limited to 'en/using-d-i')

diff --git a/en/using-d-i/components.xml b/en/using-d-i/components.xml
index b53f88ef5..ff023a345 100644
--- a/en/using-d-i/components.xml
+++ b/en/using-d-i/components.xml
@@ -77,21 +77,50 @@ like LVM or RAID devices.
 &module-lvmcfg.xml;
 &module-mdcfg.xml;
   </sect2>
+  
+  <sect2 id="di-system-setup">
+  <title>Setting up the System</title>
+<para>
+
+After partitioning the installer asks a few more questions that will be
+used to set up the system is is about the install.
+	
+</para>
+
+&module-tzsetup.xml;
+&module-clock-setup.xml;
+&module-user-setup.xml;
+</sect2>
 
   <sect2 id="di-install-base">
   <title>Installing the Base System</title>
 <para>
 
-Although this stage is the least problematic, it consumes most time of
-the install because it downloads, verifies and unpacks the whole base
-system. If you have a slow computer or network connection, this could
+Although this stage is the least problematic, it consumes a significant
+fraction of the install because it downloads, verifies and unpacks the whole
+base system. If you have a slow computer or network connection, this could
 take some time.
 
 </para>
 
 &module-base-installer.xml;
   </sect2>
+  
+  <sect2 id="di-install-software">
+  <title>Installing Additional Software</title>
+<para>
+
+After the base system is installed, you have a usable but limited system.
+Most users will want to add additional software to the system to tune it to
+their needs, and the installer lets you do so. This step can take even
+longer than installing the base system if you have a slow computer or
+network.
 
+</para>
+&module-apt-setup.xml;
+&module-pkgsel.xml;
+  </sect2>
+	
   <sect2 id="di-make-bootable">
   <title>Making Your System Bootable</title>
 
@@ -130,10 +159,10 @@ documentation for more information.
   </sect2>
 
   <sect2 id="di-finish">
-  <title>Finishing the First Stage</title>
+  <title>Finishing the Installation</title>
 <para>
 
-These are the last bits to do before rebooting to your new Debian. It
+These are the last bits to do before rebooting to your new system. It
 mostly consists of tidying up after the &d-i;.
 
 </para>
-- 
cgit v1.2.3