Move user setup to before clock setup.

10 files changed, 87 insertions, 86 deletions

diff --git a/ca/using-d-i/using-d-i.xml b/ca/using-d-i/using-d-i.xml
index 35b54dc89..30f72d3df 100644
--- a/ca/using-d-i/using-d-i.xml
+++ b/ca/using-d-i/using-d-i.xml
@@ -249,6 +249,14 @@ obtingut de la rèplica o CD triat.
 </varlistentry>
 <varlistentry>
 
+<term>user-setup</term><listitem><para>
+
+Estableix la contrasenya de root, i afegeix un usuari normal.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
 <term>clock-setup</term><listitem><para>
 
 Actualitza el rellotge del sistema i determina si aquest està en UTC o no.
@@ -324,14 +332,6 @@ funcionar sota &debian-gnu; quan es reiniciï.
 </varlistentry>
 <varlistentry>
 
-<term>user-setup</term><listitem><para>
-
-Estableix la contrasenya de root, i afegeix un usuari normal.
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-
 <term>apt-setup</term><listitem><para>
 
 Configura apt, gairebé automàticament, a partir del mitjà
diff --git a/cs/using-d-i/using-d-i.xml b/cs/using-d-i/using-d-i.xml
index da759bc24..b432f55ab 100644
--- a/cs/using-d-i/using-d-i.xml
+++ b/cs/using-d-i/using-d-i.xml
@@ -241,6 +241,15 @@ instaluje stažené balíky.
 </varlistentry>
 <varlistentry>
 
+<term>user-setup</term><listitem><para>
+
+Nastaví heslo uživatele root a vytvoří neprivilegovaného uživatele pro
+běžnou práci.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
 <term>clock-setup</term><listitem><para>
 
 Aktualizuje systémové hodiny a určí, zda jsou nastaveny na univerzální
@@ -316,15 +325,6 @@ samostatný běh &debian;u.
 </varlistentry>
 <varlistentry>
 
-<term>user-setup</term><listitem><para>
-
-Nastaví heslo uživatele root a vytvoří neprivilegovaného uživatele pro
-běžnou práci.
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-
 <term>apt-setup</term><listitem><para>
 
 Nastaví apt, což se většinou děje automaticky na základě média, ze
diff --git a/de/using-d-i/using-d-i.xml b/de/using-d-i/using-d-i.xml
index e72d8d2f2..804aefadc 100644
--- a/de/using-d-i/using-d-i.xml
+++ b/de/using-d-i/using-d-i.xml
@@ -254,6 +254,15 @@ Spiegel-Server oder von der CD geholt wurden.
 </varlistentry>
 <varlistentry>
 
+<term>user-setup (Benutzer einrichten)</term><listitem><para>
+
+Legt das root-Passwort fest und fügt dem System einen normale Benutzer
+hinzu.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
 <term>clock-setup (Uhr konfigurieren)</term><listitem><para>
 
 Aktualisiert die Systemuhr und legt fest, ob die Uhr auf UTC (Universal
@@ -331,15 +340,6 @@ Neustart den Betrieb unter &debian-gnu; ermöglichen.
 </varlistentry>
 <varlistentry>
 
-<term>user-setup (Benutzer einrichten)</term><listitem><para>
-
-Legt das root-Passwort fest und fügt dem System einen normale Benutzer
-hinzu.
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-
 <term>apt-setup (apt konfigurieren)</term><listitem><para>
 
 Konfiguriert apt überwiegend automatisch, basierend darauf, von welchem
diff --git a/debian/changelog b/debian/changelog
index 5694db7aa..34f5621eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
   * Update installation sizes.
   * Mention Windows 2003, Vista, and 7.
   * Fix graphical boot options.
+  * Move user setup to before clock setup.
 
   [ Joey Hess ]
   * Update USB stick documentation to reflect isohybird mini.iso files,
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
diff --git a/fr/using-d-i/using-d-i.xml b/fr/using-d-i/using-d-i.xml
index 220db9220..0ea3c5344 100644
--- a/fr/using-d-i/using-d-i.xml
+++ b/fr/using-d-i/using-d-i.xml
@@ -241,6 +241,15 @@ les paquets qui ont été récupérés sur le miroir choisi.
 </varlistentry>
 <varlistentry>
 
+<term>user-setup</term><listitem><para>
+
+Ce programme permet la création du mot de passe pour le superutilisateur
+(<emphasis>root</emphasis>) et l'ajout d'un utilisateur ordinaire.
+
+</para></listitem>
+</varlistentry>
+ <varlistentry>
+
 <term>clock-setup</term><listitem><para>
 
 Ce programme contrôle le réglage de l'horloge (UTC ou non).
@@ -316,15 +325,6 @@ le fonctionnement de l'ordinateur sous &debian-gnu; après le redémarrage.
 </varlistentry>
 <varlistentry>
 
-<term>user-setup</term><listitem><para>
-
-Ce programme permet la création du mot de passe pour le superutilisateur
-(<emphasis>root</emphasis>) et l'ajout d'un utilisateur ordinaire.
-
-</para></listitem>
-</varlistentry>
- <varlistentry>
-
 <term>apt-setup</term><listitem><para>
 
 Ce programme configure apt à partir d'informations tirées du
diff --git a/it/using-d-i/using-d-i.xml b/it/using-d-i/using-d-i.xml
index df7a6a96a..93a3a6dd9 100644
--- a/it/using-d-i/using-d-i.xml
+++ b/it/using-d-i/using-d-i.xml
@@ -448,6 +448,18 @@ dal mirror prescelto o dal CD.
 </varlistentry>
 <varlistentry>
 
+<term>user-setup</term><listitem><para>
+
+<!--
+Sets up the root password, and adds a non-root user.
+-->
+
+Imposta la password di root e aggiunge un utente normale.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
 <term>clock-setup</term><listitem><para>
 
 <!--
@@ -570,18 +582,6 @@ computer di funzionare sotto &debian-gnu; dopo il riavvio.
 </varlistentry>
 <varlistentry>
 
-<term>user-setup</term><listitem><para>
-
-<!--
-Sets up the root password, and adds a non-root user.
--->
-
-Imposta la password di root e aggiunge un utente normale.
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-
 <term>apt-setup</term><listitem><para>
 
 <!--
diff --git a/nl/using-d-i/using-d-i.xml b/nl/using-d-i/using-d-i.xml
index 388155858..a3c05c7a7 100644
--- a/nl/using-d-i/using-d-i.xml
+++ b/nl/using-d-i/using-d-i.xml
@@ -248,6 +248,15 @@ pakketten die zijn opgehaald vanaf de gekozen mirror of CD.
 </varlistentry>
 <varlistentry>
 
+<term>user-setup</term><listitem><para>
+
+Stelt het wachtwoord voor het <quote>root</quote> account in en voegt een
+account voor een normale gebruiker toe.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
 <term>clock-setup</term><listitem><para>
 
 Stelt de interne systeem clock in en bepaalt of de deze is ingesteld op
@@ -328,15 +337,6 @@ computer, nadat deze is herstart, onder &debian-gnu; te laten functioneren.
 </varlistentry>
 <varlistentry>
 
-<term>user-setup</term><listitem><para>
-
-Stelt het wachtwoord voor het <quote>root</quote> account in en voegt een
-account voor een normale gebruiker toe.
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-
 <term>apt-setup</term><listitem><para>
 
 Verzorgt de configuratie van apt. Dit gebeurt grotendeels automatisch op
diff --git a/pt_BR/using-d-i/using-d-i.xml b/pt_BR/using-d-i/using-d-i.xml
index c8a2bf598..503211228 100644
--- a/pt_BR/using-d-i/using-d-i.xml
+++ b/pt_BR/using-d-i/using-d-i.xml
@@ -254,6 +254,14 @@ de um mirror selecionado.
 </varlistentry>
 <varlistentry>
 
+<term>user-setup</term><listitem><para>
+
+Configura a senha do root e adiciona um usuário não-root.
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
 <term>clock-setup</term><listitem><para>
 
 Atualiza o relógio do sistema e determina se o relógio está configurado
@@ -332,14 +340,6 @@ o computador funcione sob o &debian-gnu; quando reinicializado.
 </varlistentry>
 <varlistentry>
 
-<term>user-setup</term><listitem><para>
-
-Configura a senha do root e adiciona um usuário não-root.
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-
 <term>apt-setup</term><listitem><para>
 
 Configura o apt, quase automaticamente, com base em a partir de