From 616f268e48dc670ebd97991c21f3f9c6261f1f69 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <sthibault@debian.org>
Date: Thu, 28 Oct 2010 18:11:38 +0000
Subject: Move user setup to before clock setup.

---
 en/using-d-i/components.xml | 28 ++++++++++++++--------------
 en/using-d-i/using-d-i.xml  | 16 ++++++++--------
 2 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'en')

diff --git a/en/using-d-i/components.xml b/en/using-d-i/components.xml
index 11e6e5395..33f0f9acd 100644
--- a/en/using-d-i/components.xml
+++ b/en/using-d-i/components.xml
@@ -62,6 +62,20 @@ See <xref linkend="loading-firmware"/> for further details.
 
   </sect2>
 
+  <sect2 id="di-user-setup">
+  <title>Setting Up Users And Passwords</title>
+<para>
+
+Just before configuring the clock, 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-partition">
   <title>Partitioning and Mount Point Selection</title>
 <para>
@@ -101,20 +115,6 @@ 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>
diff --git a/en/using-d-i/using-d-i.xml b/en/using-d-i/using-d-i.xml
index e8d1bafec..18304e888 100644
--- a/en/using-d-i/using-d-i.xml
+++ b/en/using-d-i/using-d-i.xml
@@ -244,6 +244,14 @@ from the chosen mirror or CD.
 </varlistentry>
 <varlistentry>
 
+<term>user-setup</term><listitem><para>
+
+Sets up the root password, and adds a non-root user.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
 <term>clock-setup</term><listitem><para>
 
 Updates the system clock and determines whether the clock is set to UTC
@@ -321,14 +329,6 @@ the computer to operate under &debian-gnu; when rebooted.
 </varlistentry>
 <varlistentry>
 
-<term>user-setup</term><listitem><para>
-
-Sets up the root password, and adds a non-root user.
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-
 <term>apt-setup</term><listitem><para>
 
 Configures apt, mostly automatically, based on what media the installer is
-- 
cgit v1.2.3