Update using-d-i for post-Etch changes:

- move clock-setup, tzsetup and user-setup to reflect their changed
  position in the installation procedure
- mention that clock-setup will now attempt to set the system time from a
  time server
- split clock-setup as part is now executed during finish-install
- add instructions on how a different time zone from the one(s) that match
  the selected location can be set (as that is a FAQ)

7 files changed, 148 insertions, 88 deletions

diff --git a/en/using-d-i/components.xml b/en/using-d-i/components.xml
index bfedd1810..d3a3d30ff 100644
--- a/en/using-d-i/components.xml
+++ b/en/using-d-i/components.xml
@@ -49,6 +49,8 @@ hardware detection needs to be repeated later in the process.
 &module-anna.xml;
 &module-netcfg.xml;
 &module-choose-mirror.xml;
+<!-- tzsetup is included in clock-setup -->
+&module-clock-setup.xml;
 
   </sect2>
 
@@ -62,8 +64,8 @@ and ready to do some real work.
 
 As the title of this section indicates, the main task of the next few
 components lies in partitioning your disks, creating filesystems,
-assigning mountpoints and optionally configuring closely related issues
-like LVM or RAID devices.
+assigning mountpoints and optionally configuring closely related options
+like RAID, LVM or encrypted devices.
 
 </para>
 
@@ -77,20 +79,6 @@ like LVM or RAID devices.
 &module-partman-crypto.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 it is about to 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>
@@ -104,18 +92,33 @@ take some time.
 
 &module-base-installer.xml;
   </sect2>
-  
+
+  <sect2 id="di-user-setup">
+  <title>Setting Up Users And Passwords</title>
+<para>
+
+After the base system has been installed, the installer will allow you
+to set up the <quote>root</quote> account and/or an account for the first
+user. Other user accounts can be created after the installation has been
+completed.
+
+</para>
+
+&module-user-setup.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.
+At this point you have a usable but limited system.
 Most users will want to install additional software on the system to tune it to
 their needs, and the installer allows you do so. This step can take even
 longer than installing the base system if you have a slow computer or
-network.
+network connection.
 
 </para>
+
 &module-apt-setup.xml;
 &module-pkgsel.xml;
   </sect2>
@@ -153,11 +156,13 @@ linkend="boot-dev-select-sun"/>.</phrase>
   <title>Finishing the Installation</title>
 <para>
 
-These are the last bits to do before rebooting to your new system. It
-mostly consists of tidying up after the &d-i;.
+This is the last step in the Debian installation process during which the
+installer will do any last minute tasks.
+It mostly consists of tidying up after the &d-i;.
 
 </para>
 
+&module-clock-setup-finish.xml;
 &module-finish-install.xml;
   </sect2>
 
diff --git a/en/using-d-i/modules/clock-setup-finish.xml b/en/using-d-i/modules/clock-setup-finish.xml
new file mode 100644
index 000000000..8067fad26
--- /dev/null
+++ b/en/using-d-i/modules/clock-setup-finish.xml
@@ -0,0 +1,33 @@
+<!-- retain these comments for translator revision tracking -->
+<!-- $Id$ -->
+
+   <sect3 id="system-clock">
+   <title>Setting the System Clock</title>
+
+<para>
+
+The installer may ask you if the computer's clock is set to UTC. Normally
+this question is avoided if possible and the installer tries to work out
+whether the clock is set to UTC based on things like what other operating
+systems are installed. 
+
+</para><para>
+
+In expert mode you will always be able to choose
+whether or not the clock is set to UTC.
+<phrase arch="m68k;powerpc">Macintosh hardware clocks are normally
+set to local time. If you want to dual-boot, select local time instead of
+UTC.</phrase>
+<phrase arch="x86">Systems that (also) run Dos or Windows are normally
+set to local time. If you want to dual-boot, select local time
+instead of UTC.</phrase>
+
+</para><para>
+
+At this point &d-i; will also attempt to save the current time to the
+system's hardware clock. This will be done either in UTC or local time,
+depending on the selection that was just made.
+
+</para>
+
+   </sect3>
diff --git a/en/using-d-i/modules/clock-setup.xml b/en/using-d-i/modules/clock-setup.xml
index 2d9b00c82..9d14f8604 100644
--- a/en/using-d-i/modules/clock-setup.xml
+++ b/en/using-d-i/modules/clock-setup.xml
@@ -6,29 +6,15 @@
 
 <para>
 
-The installer might ask you if the computer's clock is set to UTC. Normally
-this question is avoided if possible and the installer tries to work out
-whether the clock is set to UTC based on things like what other operating
-systems are installed. 
-
-</para><para>
-
-In expert mode you will always be able to choose
-whether or not the clock is set to UTC.
-<phrase arch="m68k;powerpc">Macintosh hardware clocks are normally
-set to local time. If you want to dual-boot, select local time instead of
-GMT.</phrase>
-<phrase arch="x86">Systems that (also) run Dos or Windows are normally
-set to local time. If you want to dual-boot, select local time
-instead of GMT.</phrase>
-
-</para><para>
-
-Note that the installer does not currently allow you to actually set the
-time in the computer's clock. You can set the clock to the current time
-after you have installed, if it is incorrect or if it was previously not
-set to UTC.
+The installer will first attempt to connect to a time server on the
+Internet (using the <firstterm>NTP</firstterm> protocol) in order to
+correctly set the system time. If this does not succeed, the installer
+will assume the time and date obtained from the system clock when the
+installation system was booted are correct. It is not possible to manually
+set the system time during the installation process.
 
 </para>
 
+&module-tzsetup.xml;
+
    </sect3>
diff --git a/en/using-d-i/modules/finish-install.xml b/en/using-d-i/modules/finish-install.xml
index 9d21657f0..032901eef 100644
--- a/en/using-d-i/modules/finish-install.xml
+++ b/en/using-d-i/modules/finish-install.xml
@@ -2,21 +2,19 @@
 <!-- $Id$ -->
 
    <sect3 id="finish-install">
-   <title>Finish the Installation and Reboot</title>
+   <title>Reboot the System</title>
 
-<para>
+<para arch="not-s390">
 
-This is the last step in the initial Debian installation process. You will
-be prompted to remove the boot media (CD, floppy, etc) that you used to
-boot the installer. The installer will do any last minute tasks, and then
-reboot into your new Debian system.
+You will be prompted to remove the boot media (CD, floppy, etc) that you
+used to boot the installer. After that the system will be rebooted into
+your new Debian system.
 
 </para><para arch="s390">
 
-Select the <guimenuitem>Finish the installation</guimenuitem>
-menu item which will halt the system
-because rebooting is not supported on &arch-title; in this case. You
-then need to IPL GNU/Linux from the DASD which you selected for the
+After a final prompt the system will be halted because rebooting is not
+supported on &arch-title;.
+You then need to IPL &debian; from the DASD which you selected for the
 root filesystem during the first steps of the installation.
 
 </para>
diff --git a/en/using-d-i/modules/tzsetup.xml b/en/using-d-i/modules/tzsetup.xml
index 8297c5cad..7e376e1e1 100644
--- a/en/using-d-i/modules/tzsetup.xml
+++ b/en/using-d-i/modules/tzsetup.xml
@@ -1,16 +1,57 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
 
-   <sect3 id="tzsetup">
-   <title>Configuring Your Time Zone</title>
+<!-- As tzsetup is invoked from inside clock-setup, this is not a
+     separate section -->
 
 <para>
 
 Depending on the location selected at the beginning of the installation
-process, you might be shown a list of timezones relevant for that location.
+process, you may be shown a list of timezones relevant for that location.
 If your location has only one time zone, you will not be asked anything and
 the system will assume that time zone.
 
+</para><para>
+
+If for some reason you wish to set a time zone for the installed system
+that does <emphasis>not</emphasis> match the selected location, there are
+two options.
+
+</para>
+
+<orderedlist>
+<listitem>
+
+<para>
+
+The simplest option is to just select a different timezone after the
+installation has been completed and you've booted into the new system.
+The command to do this is:
+
+<informalexample><screen>
+# dpkg-reconfigure tzdata
+</screen></informalexample>
+
+</para>
+
+</listitem><listitem>
+
+<para>
+
+Alternatively, the time zone can be set at the very start of the
+installation by passing the parameter
+<userinput>time/zone=<replaceable>value</replaceable></userinput>
+when you boot the installation system. The value should of course be a
+valid time zone, for example <userinput>Europe/London</userinput> or
+<userinput>UTC</userinput>.
+
 </para>
 
-   </sect3>
+</listitem>
+</orderedlist>
+
+<para>
+
+For automated installations the time zone can also be set using preseeding.
+
+</para>
diff --git a/en/using-d-i/modules/user-setup.xml b/en/using-d-i/modules/user-setup.xml
index 5c68d73e7..fa2a7d63c 100644
--- a/en/using-d-i/modules/user-setup.xml
+++ b/en/using-d-i/modules/user-setup.xml
@@ -1,11 +1,8 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
 
-   <sect3 id="user-setup">
-   <title>Setting Up Users And Passwords</title>
-
-    <sect4 id="user-setup-root">
-    <title>Set the Root Password</title>
+   <sect3 id="user-setup-root">
+   <title>Set the Root Password</title>
 
 <!-- TODO: Document sudo setup (no root password); medium/low prio only -->
 
@@ -32,10 +29,10 @@ wary. You should normally never give your root password out, unless you
 are administering a machine with more than one system administrator.
 
 </para>
-   </sect4>
+  </sect3>
 
-   <sect4 id="make-normal-user">
-   <title>Create an Ordinary User</title>
+  <sect3 id="make-normal-user">
+  <title>Create an Ordinary User</title>
 
 <para>
 
@@ -69,5 +66,4 @@ If at any point after installation you would like to create another
 account, use the <command>adduser</command> command.
 
 </para>
-    </sect4>
    </sect3>
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index 7e35f5dbe..6f7239c80 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -227,6 +227,23 @@ from the chosen mirror or CD.
 </varlistentry>
 <varlistentry>
 
+<term>clock-setup</term><listitem><para>
+
+Updates the system clock and determines whether the clock is set to UTCr
+or not.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
+<term>tzsetup</term><listitem><para>
+
+Selects the time zone, based on the location selected earlier.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
 <term>partman</term><listitem><para>
 
 Allows the user to partition disks attached to the system, create file
@@ -286,23 +303,16 @@ newer motherboards.
 </para></listitem>
 </varlistentry>
 <varlistentry>
-	
-<term>tzsetup</term><listitem><para>
-
-Selects the time zone, based on the location selected earlier.
-		
-</para></listitem>
-</varlistentry>
-<varlistentry>
 
-<term>clock-setup</term><listitem><para>
+<term>base-installer</term><listitem><para>
 
-Determines whether the clock is set to UTC or not.
+Installs the most basic set of packages which would allow
+the computer to operate under Linux when rebooted.
 
 </para></listitem>
 </varlistentry>
 <varlistentry>
-	
+
 <term>user-setup</term><listitem><para>
 
 Sets up the root password, and adds a non-root user.
@@ -311,15 +321,6 @@ Sets up the root password, and adds a non-root user.
 </varlistentry>
 <varlistentry>
 
-<term>base-installer</term><listitem><para>
-
-Installs the most basic set of packages which would allow
-the computer to operate under Linux when rebooted.
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-	
 <term>apt-setup</term><listitem><para>
 
 Configures apt, mostly automatically, based on what media the installer is
@@ -328,7 +329,7 @@ running from.
 </para></listitem>
 </varlistentry>
 <varlistentry>
-	
+
 <term>pkgsel</term><listitem><para>
 
 Uses <classname>tasksel</classname> to select and install additional software.
@@ -336,7 +337,7 @@ Uses <classname>tasksel</classname> to select and install additional software.
 </para></listitem>
 </varlistentry>
 <varlistentry>
-	
+
 <term>os-prober</term><listitem><para>
 
 Detects currently installed operating systems on the computer and