* Make subsection Installation Over the Network a direct child of Using

    Individual Components instead of hiding it in "Miscellaneous".
  * Rename 6.3.8 "Miscellaneous" into "Troubleshooting".

18 files changed, 38 insertions, 35 deletions

diff --git a/ca/using-d-i/components.xml b/ca/using-d-i/components.xml
index 1a4347e57..4de3dcf13 100644
--- a/ca/using-d-i/components.xml
+++ b/ca/using-d-i/components.xml
@@ -188,6 +188,6 @@ en cas que alguna cosa vagi malament.
 &module-save-logs.xml;
 &module-cdrom-checker.xml;
 &module-shell.xml;
-&module-network-console.xml;
   </sect2>
+&module-network-console.xml;
  </sect1>
diff --git a/ca/using-d-i/modules/network-console.xml b/ca/using-d-i/modules/network-console.xml
index 86c72918f..d97667197 100644
--- a/ca/using-d-i/modules/network-console.xml
+++ b/ca/using-d-i/modules/network-console.xml
@@ -1,8 +1,8 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- original version: 62714 -->
 
-   <sect3 id="network-console">
-   <title>Instal·lació a través de la xarxa</title>
+  <sect2 id="network-console">
+  <title>Instal·lació a través de la xarxa</title>
 
 <para arch="not-s390">
 
@@ -130,4 +130,4 @@ la instal·lació no finalitzi correctament.
 
 </para></warning>
 
-   </sect3>
+  </sect2>
diff --git a/cs/using-d-i/components.xml b/cs/using-d-i/components.xml
index b31dbf1b7..44fdfebf3 100644
--- a/cs/using-d-i/components.xml
+++ b/cs/using-d-i/components.xml
@@ -190,6 +190,6 @@ pokazí.
 &module-save-logs.xml;
 &module-cdrom-checker.xml;
 &module-shell.xml;
-&module-network-console.xml;
   </sect2>
+&module-network-console.xml;
  </sect1>
diff --git a/cs/using-d-i/modules/network-console.xml b/cs/using-d-i/modules/network-console.xml
index 76d73b329..cf955de37 100644
--- a/cs/using-d-i/modules/network-console.xml
+++ b/cs/using-d-i/modules/network-console.xml
@@ -1,8 +1,8 @@
 <!-- $Id$ -->
 <!-- original version: 62714 -->
 
-   <sect3 id="network-console">
-   <title>Instalace přes síť</title>
+  <sect2 id="network-console">
+  <title>Instalace přes síť</title>
 
 <para arch="not-s390">
 
@@ -130,4 +130,4 @@ instalaci nebo k problémům v novém systému.
 
 </para></warning>
 
-   </sect3>
+  </sect2>
diff --git a/de/using-d-i/components.xml b/de/using-d-i/components.xml
index 33735f3d4..df5c5089d 100644
--- a/de/using-d-i/components.xml
+++ b/de/using-d-i/components.xml
@@ -190,6 +190,6 @@ Benutzer zu unterstützen, falls etwas schief läuft.
 &module-save-logs.xml;
 &module-cdrom-checker.xml;
 &module-shell.xml;
-&module-network-console.xml;
   </sect2>
+&module-network-console.xml;
  </sect1>
diff --git a/de/using-d-i/modules/network-console.xml b/de/using-d-i/modules/network-console.xml
index 5a9b668e1..5cceeedf4 100644
--- a/de/using-d-i/modules/network-console.xml
+++ b/de/using-d-i/modules/network-console.xml
@@ -1,8 +1,8 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- original version: 62714 -->
 
-   <sect3 id="network-console">
-   <title>Installation über das Netzwerk (network-console)</title>
+  <sect2 id="network-console">
+  <title>Installation über das Netzwerk (network-console)</title>
 
 <para arch="not-s390">
 
@@ -142,4 +142,4 @@ Installation oder zu Problemen mit dem installierten System führen.
 
 </para></warning>
 
-   </sect3>
+  </sect2>
diff --git a/debian/changelog b/debian/changelog
index 9e8dad030..658fe6823 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,9 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
     (Closes: Bug#603159).
   * Move boot parameters subsections from inside the debian installer parameters
     section, to which they don't really belong.
+  * Make subsection Installation Over the Network a direct child of Using
+    Individual Components instead of hiding it in "Miscellaneous".
+  * Rename 6.3.8 "Miscellaneous" into "Troubleshooting".
 
   [ 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 33f0f9acd..828b6a11e 100644
--- a/en/using-d-i/components.xml
+++ b/en/using-d-i/components.xml
@@ -173,7 +173,7 @@ It mostly consists of tidying up after the &d-i;.
   </sect2>
 
   <sect2 id="di-miscellaneous">
-  <title>Miscellaneous</title>
+  <title>Troubleshooting</title>
 <para>
 
 The components listed in this section are usually not involved in the
@@ -185,6 +185,6 @@ user in case something goes wrong.
 &module-save-logs.xml;
 &module-cdrom-checker.xml;
 &module-shell.xml;
-&module-network-console.xml;
   </sect2>
+&module-network-console.xml;
  </sect1>
diff --git a/en/using-d-i/modules/network-console.xml b/en/using-d-i/modules/network-console.xml
index 5cfd339e5..e92334c06 100644
--- a/en/using-d-i/modules/network-console.xml
+++ b/en/using-d-i/modules/network-console.xml
@@ -1,8 +1,8 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
 
-   <sect3 id="network-console">
-   <title>Installation Over the Network</title>
+  <sect2 id="network-console">
+  <title>Installation Over the Network</title>
 
 <para arch="not-s390">
 
@@ -131,4 +131,4 @@ problems with the installed system.
 
 </para></warning>
 
-   </sect3>
+  </sect2>
diff --git a/eu/using-d-i/components.xml b/eu/using-d-i/components.xml
index 6f8a69b13..9729f8734 100644
--- a/eu/using-d-i/components.xml
+++ b/eu/using-d-i/components.xml
@@ -122,7 +122,7 @@ erabiltzailea laguntzeko zerbait gaizki joanez gero.
 &module-save-logs.xml;
 &module-cdrom-checker.xml;
 &module-shell.xml;
-&module-baseconfig.xml;
   </sect2>
+&module-network-console.xml;
  </sect1>
 
diff --git a/fr/using-d-i/components.xml b/fr/using-d-i/components.xml
index 4e5ce99aa..825d1a7ba 100644
--- a/fr/using-d-i/components.xml
+++ b/fr/using-d-i/components.xml
@@ -179,7 +179,7 @@ attendent en silence que l'utilisateur ait besoin d'aide.
 &module-save-logs.xml;
 &module-cdrom-checker.xml;
 &module-shell.xml;
-&module-network-console.xml;
 
   </sect2>
+&module-network-console.xml;
  </sect1>
diff --git a/fr/using-d-i/modules/network-console.xml b/fr/using-d-i/modules/network-console.xml
index 745ee966f..69e0d1f59 100644
--- a/fr/using-d-i/modules/network-console.xml
+++ b/fr/using-d-i/modules/network-console.xml
@@ -1,7 +1,7 @@
 <!-- original version: 62714 -->
 
-   <sect3 id="network-console">
-   <title>Installation par le réseau</title>
+  <sect2 id="network-console">
+  <title>Installation par le réseau</title>
 
 <para arch="not-s390">
 
@@ -124,4 +124,4 @@ dans le système installé.
 
 </para></warning>
 
-   </sect3>
+  </sect2>
diff --git a/it/using-d-i/components.xml b/it/using-d-i/components.xml
index 760fa57eb..2b8ad2c13 100644
--- a/it/using-d-i/components.xml
+++ b/it/using-d-i/components.xml
@@ -301,7 +301,7 @@ aiutare l'utente nel caso che qualcosa vada storto.
 &module-save-logs.xml;
 &module-cdrom-checker.xml;
 &module-shell.xml;
-&module-network-console.xml;
 
   </sect2>
+&module-network-console.xml;
  </sect1>
diff --git a/it/using-d-i/modules/network-console.xml b/it/using-d-i/modules/network-console.xml
index 85abef73d..6d2b86088 100644
--- a/it/using-d-i/modules/network-console.xml
+++ b/it/using-d-i/modules/network-console.xml
@@ -1,9 +1,9 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- original version: 62714 -->
 
-   <sect3 id="network-console">
-   <!-- <title>Installation Over the Network</title> -->
-   <title>Installazione dalla rete</title>
+  <sect2 id="network-console">
+  <!-- <title>Installation Over the Network</title> -->
+  <title>Installazione dalla rete</title>
 <para arch="not-s390">
 
 <!--
@@ -257,4 +257,4 @@ dell'installazione oppure dei problemi nel sistema una volta conclusa
 l'installazione.
 
 </para></warning>
-   </sect3>
+  </sect2>
diff --git a/nl/using-d-i/components.xml b/nl/using-d-i/components.xml
index 659b9c949..560ca939a 100644
--- a/nl/using-d-i/components.xml
+++ b/nl/using-d-i/components.xml
@@ -187,6 +187,6 @@ als er iets mis gaat.
 &module-save-logs.xml;
 &module-cdrom-checker.xml;
 &module-shell.xml;
-&module-network-console.xml;
   </sect2>
+&module-network-console.xml;
  </sect1>
diff --git a/nl/using-d-i/modules/network-console.xml b/nl/using-d-i/modules/network-console.xml
index 2977bc32a..edaee355f 100644
--- a/nl/using-d-i/modules/network-console.xml
+++ b/nl/using-d-i/modules/network-console.xml
@@ -1,7 +1,7 @@
 <!-- original version: 31173 -->
 
-   <sect3 id="network-console">
-   <title>Installeren over het netwerk</title>
+  <sect2 id="network-console">
+  <title>Installeren over het netwerk</title>
 
 <para arch="not-s390">
 
@@ -107,4 +107,4 @@ zal zijn dat de verbinding wordt verbroken.
 
 </para></warning>
 
-   </sect3>
+  </sect2>
diff --git a/pt_BR/using-d-i/components.xml b/pt_BR/using-d-i/components.xml
index 8562ef209..cf0f4aa4a 100644
--- a/pt_BR/using-d-i/components.xml
+++ b/pt_BR/using-d-i/components.xml
@@ -190,6 +190,6 @@ o usuário em caso de algo dar errado.
 &module-save-logs.xml;
 &module-cdrom-checker.xml;
 &module-shell.xml;
-&module-network-console.xml;
   </sect2>
+&module-network-console.xml;
  </sect1>
diff --git a/pt_BR/using-d-i/modules/network-console.xml b/pt_BR/using-d-i/modules/network-console.xml
index 87f48341e..1c7fd98b6 100644
--- a/pt_BR/using-d-i/modules/network-console.xml
+++ b/pt_BR/using-d-i/modules/network-console.xml
@@ -3,8 +3,8 @@
 <!-- updated 31173:56141 by Felipe Augusto van de Wiel (faw) 2008.11.10 -->
 <!-- updated 56141:62714 by Felipe Augusto van de Wiel (faw) 2010.05.17 -->
 
-   <sect3 id="network-console">
-   <title>Instalação Pela Rede</title>
+  <sect2 id="network-console">
+  <title>Instalação Pela Rede</title>
 
 <para arch="not-s390">
 
@@ -135,4 +135,4 @@ ou problemas no sistema instalado.
 
 </para></warning>
 
-   </sect3>
+  </sect2>