Update NetInstall catalog

3 files changed, 86 insertions, 31 deletions

diff --git a/docs/docs/stable/bootiso/en/NetInstall-cover.xml b/docs/docs/stable/bootiso/en/NetInstall-cover.xml
index 9f3b04a5..06327175 100644
--- a/docs/docs/stable/bootiso/en/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/en/NetInstall-cover.xml
@@ -1,34 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<book xmlns="http://docbook.org/ns/docbook" 
-      xmlns:xi="http://www.w3.org/2001/XInclude" 
-      xmlns:ns6="http://www.w3.org/1999/xlink" 
-      xmlns:ns5="http://www.w3.org/1998/Math/MathML" 
-      xmlns:ns4="http://www.w3.org/1999/xhtml" 
-      xmlns:ns3="http://www.w3.org/2000/svg" 
-      xmlns:ns="http://docbook.org/ns/docbook" 
-      version="5.0" xml:lang="en" xml:id="NetInstall">
-
+<book xmlns="http://docbook.org/ns/docbook"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
+      xmlns:ns62="http://docbook.org/ns/transclusion"
+      xmlns:ns6="http://www.w3.org/1999/xlink"
+      xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+      xmlns:ns4="http://www.w3.org/1999/xhtml"
+      xmlns:ns3="http://www.w3.org/2000/svg"
+      xmlns:ns="http://docbook.org/ns/docbook"
+      version="5.0" xml:lang="en" xml:id="NetInstall-cover">
   <info>
-    <title>Installation with tiny image</title>
+    <title>Mageia NetInstall</title>
+
+    <publisher>
+      <publishername>Mageia.org</publishername>
+    </publisher>
+
+    <revhistory>
+      <revision>
+        <date>May 2018</date>
+
+        <revremark>Mageia 7</revremark>
+      </revision>
+    </revhistory>
+
     <cover>
-      <para role="tagline">The tool to install Mageia with remote repositories</para>
+      <para role="tagline">The tool to install Mageia with remote
+      repositories</para>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>The texts and screenshots in this manual are available under the CC BY-SA 3.0 license
-		    <link ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>This manual was produced with the help of the <link ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>It was written by volunteers in their free time. Please contact <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation Team</link>, if you would like to help improve this manual.</para>
+      <para>The texts and screenshots in this manual are available under the
+      CC BY-SA 3.0 license <link
+      ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>This manual was produced with the help of the <link
+      ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
+      ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>It was written by volunteers in their free time. Please contact
+      the <link
+      ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+      Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
+
   <article>
-  
-<xi:include href="bootIso.xml"></xi:include>
+    <title>Installing Mageia using a Tiny Boot Image</title>
+
+    <xi:include href="netInstall-intro.xml"/>
+
+    <xi:include href="netInstall-stage1.xml"/>
 
-</article>
+    <xi:include href="netInstall-stage2.xml"/>
+  </article>
 </book>
diff --git a/docs/docs/stable/bootiso/en/NetInstall.xml b/docs/docs/stable/bootiso/en/NetInstall.xml
index 6478a342..243e93b5 100644
--- a/docs/docs/stable/bootiso/en/NetInstall.xml
+++ b/docs/docs/stable/bootiso/en/NetInstall.xml
@@ -1,6 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?><!-- Converted by db4-upgrade version 1.0 --><article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="UTF-8"?>
+<article version="5.0" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns62="http://docbook.org/ns/transclusion"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xhtml"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title>Installation with tiny image</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -9,18 +19,37 @@
           choices you make while installing.</para>
         </note></para>
 
-      <para xml:id="CC_BY-SA">The texts and screenshots in this manual are available under the
-      CC BY-SA 3.0 license
- <link ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+      <para xml:id="CC_BY-SA">The texts and screenshots in this manual are
+      available under the CC BY-SA 3.0 license <link
+      ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
 
-      <para>This manual was produced with the help of the <link ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+      <para>This manual was produced with the help of the <link
+      ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
+      ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>It was written by volunteers in their free time. Please contact <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation Team</link>, if you would like to help improve this manual.</para>
+      <para>It was written by volunteers in their free time. Please contact
+      the <link
+      ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+      Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
-  
+
   <!-- <xi:include href="drakx-intro.xml"/> -->
 
-  <xi:include href="bootIso.xml"/>
+  <!-- 2018/??/?? apb: a) Bit of a re-word/format.
+  b) Disabled the XInclude for bootIso.xml, and included its contents directly within this NetInstall.xml instead. It does not seem practical to have NetInstall.xml acting as the header for
+  just bootIso.xml. As it was, there were basically two competing titles (one for NetInstall and one for bootIso), and this also resulted in an unnecessary extra nest level for bootIso sections.
+  c) I have also (via xi:include) bolted on the Classical Installer XML's (starting from Please Choose a Language) to Stage 2. This seems better than just pointing people to the documentation.
+  d) Update some PNG's to Mga6 and center-align all PNG's. Added a PNG each for NFS and 3rd-party. Uploaded a renamed set of PNG's (from Boot/boot-iso/imgx/x.png to netInstall-xx.png) and using those instead.
+  e) Made a couple of web-link pointers verbose (instead of see "here"). -->
+
+  <!-- <xi:include href="bootIso.xml"/> -->
+
+  <!-- 2018/05/18 apb: Split the body into 3 parts: netInstall-intro.xml, netInstall-stage1.xml and netInstall-stage2.xml -->
+
+  <xi:include href="netInstall-intro.xml"/>
+
+  <xi:include href="netInstall-stage1.xml"/>
 
+  <xi:include href="netInstall-stage2.xml"/>
 </article>
diff --git a/docs/docs/stable/bootiso/en/bootIso.xml b/docs/docs/stable/bootiso/en/bootIso.xml
index 4467b191..79e3c1bd 100644
--- a/docs/docs/stable/bootiso/en/bootIso.xml
+++ b/docs/docs/stable/bootiso/en/bootIso.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:id="SOME_UNIQUE_ID">
+<?xml version='1.0' encoding='UTF-8'?><section version="5.0" xml:id="SOME_UNIQUE_ID" xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink">
   <info>
     <title xml:id="bootIso-ti1">Installation with a tiny boot image</title>
   </info>
@@ -22,7 +22,7 @@
         ROM</emphasis></simpara>
       </listitem>
       <listitem>
-        <simpara>the ISO image on a <emphasis role="bold">lan</emphasis>
+        <simpara>the ISO image on a <emphasis role="bold">LAN</emphasis>
         (local area network)</simpara>
       </listitem>
     </itemizedlist>