1410 files changed, 80251 insertions, 34545 deletions

diff --git a/docs/docs/stable/bootiso/ca/NetInstall-cover.xml b/docs/docs/stable/bootiso/ca/NetInstall-cover.xml
index af039c27..33caeda7 100644
--- a/docs/docs/stable/bootiso/ca/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/ca/NetInstall-cover.xml
@@ -1,40 +1,56 @@
 <?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="ca" 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="ca" xml:id="NetInstall-cover">
   <info>
-    <title>Instal·lació amb una imatge petita</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">L'eina per instal·lar Mageia amb dipòsits remots</para>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>Els textos i les captures de pantalla d'aquest manual estan disponibles sota
+      <para>Els textos i les captures de pantalla d'aquest manual estan disponibles sota
 la llicència CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Aquest manual ha estat creat amb l'ajuda de <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Aquest manual ha estat creat amb l'ajuda de <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> desenvolupat per <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>L'han escrit voluntaris durant el seu temps lliure. Si voleu ajudar a
-millorar-lo, contacteu l'<link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">equip de
-documentació</link>.</para>
+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/ca/NetInstall.xml b/docs/docs/stable/bootiso/ca/NetInstall.xml
index a8f2d6ea..c0e83e9e 100644
--- a/docs/docs/stable/bootiso/ca/NetInstall.xml
+++ b/docs/docs/stable/bootiso/ca/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="ca" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="ca" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Instal·lació amb una imatge petita</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -20,15 +38,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> desenvolupat per <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>L'han escrit voluntaris durant el seu temps lliure. Si voleu ajudar a
-millorar-lo, contacteu l'<link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">equip de
-documentació</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>
+
   
+
   
 
-  <xi:include href="bootIso.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/ca/netInstall-intro.xml b/docs/docs/stable/bootiso/ca/netInstall-intro.xml
new file mode 100644
index 00000000..6138ba42
--- /dev/null
+++ b/docs/docs/stable/bootiso/ca/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/ca/netInstall-stage1.xml b/docs/docs/stable/bootiso/ca/netInstall-stage1.xml
new file mode 100644
index 00000000..66bed270
--- /dev/null
+++ b/docs/docs/stable/bootiso/ca/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>Si obteniu molts errors de dependències no resoltes després, a la
+instal·lació; reinicieu i proveu una rèplica diferent.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/ca/netInstall-stage2.xml b/docs/docs/stable/bootiso/ca/netInstall-stage2.xml
new file mode 100644
index 00000000..f603ef66
--- /dev/null
+++ b/docs/docs/stable/bootiso/ca/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/cs/NetInstall-cover.xml b/docs/docs/stable/bootiso/cs/NetInstall-cover.xml
index 66a26067..6d0d1b41 100644
--- a/docs/docs/stable/bootiso/cs/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/cs/NetInstall-cover.xml
@@ -1,39 +1,56 @@
 <?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="cs" 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="cs" xml:id="NetInstall-cover">
   <info>
-    <title>Instalace s velmi malým obrazem</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">Nástroj na instalaci Mageii pomocí vzdálených úložišť</para>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>Texty a snímky obrazovky v této příručce jsou dostupné pod licencí CC BY-SA
+      <para>Texty a snímky obrazovky v této příručce jsou dostupné pod licencí CC BY-SA
 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Tato příručka byla vytvořena s pomocí <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Tato příručka byla vytvořena s pomocí <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> vyvinutého <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>em.
-	    </para>
-            <para>Byla napsána dobrovolníky v jejich volném čase. Spojte se, prosím, s <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentačním
-týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para>
+ns6:href="http://www.neodoc.biz">NeoDoc</link>em.</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/cs/NetInstall.xml b/docs/docs/stable/bootiso/cs/NetInstall.xml
index 1f4011c4..ec6c76d5 100644
--- a/docs/docs/stable/bootiso/cs/NetInstall.xml
+++ b/docs/docs/stable/bootiso/cs/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="cs" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="cs" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Instalace s velmi malým obrazem</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -20,14 +38,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> vyvinutého <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>em.</para>
 
-      <para>Byla napsána dobrovolníky v jejich volném čase. Spojte se, prosím, s <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentačním
-týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</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="bootIso.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/cs/netInstall-intro.xml b/docs/docs/stable/bootiso/cs/netInstall-intro.xml
new file mode 100644
index 00000000..a7a81f9d
--- /dev/null
+++ b/docs/docs/stable/bootiso/cs/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/cs/netInstall-stage1.xml b/docs/docs/stable/bootiso/cs/netInstall-stage1.xml
new file mode 100644
index 00000000..dddbe5c1
--- /dev/null
+++ b/docs/docs/stable/bootiso/cs/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>Pokud během instalace později dostanete spoustu chybových hlášení o
+chybějících závislostech, proveďte restart a zkuste jiné zrcadlo.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/cs/netInstall-stage2.xml b/docs/docs/stable/bootiso/cs/netInstall-stage2.xml
new file mode 100644
index 00000000..fce7a4a3
--- /dev/null
+++ b/docs/docs/stable/bootiso/cs/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/eo/NetInstall-cover.xml b/docs/docs/stable/bootiso/eo/NetInstall-cover.xml
index 3647d694..31bdeeaf 100644
--- a/docs/docs/stable/bootiso/eo/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/eo/NetInstall-cover.xml
@@ -1,39 +1,56 @@
 <?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="eo" 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="eo" 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>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>La tekstoj kaj la ekranbildoj en ĉi helpo estas sub licenco CC-BY-SA 3.0
+      <para>La tekstoj kaj la ekranbildoj en ĉi helpo estas sub licenco CC-BY-SA 3.0
 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-	    </para>
-	    <para>Tiu ĉi helpo estas skribita kun helpo de <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Tiu ĉi helpo estas skribita kun helpo de <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> kreita per <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="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/eo/NetInstall.xml b/docs/docs/stable/bootiso/eo/NetInstall.xml
index 363d704b..c27e32f4 100644
--- a/docs/docs/stable/bootiso/eo/NetInstall.xml
+++ b/docs/docs/stable/bootiso/eo/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="eo" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="eo" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Installation with tiny image</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -19,14 +37,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> kreita per <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
 
-      <para>It was written by volunteers in their free time. Please contact <link
+      <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="bootIso.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/eo/netInstall-intro.xml b/docs/docs/stable/bootiso/eo/netInstall-intro.xml
new file mode 100644
index 00000000..787b8b73
--- /dev/null
+++ b/docs/docs/stable/bootiso/eo/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/eo/netInstall-stage1.xml b/docs/docs/stable/bootiso/eo/netInstall-stage1.xml
new file mode 100644
index 00000000..8d9b7f0c
--- /dev/null
+++ b/docs/docs/stable/bootiso/eo/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>If you get a lot of missing dependency errors later in the install, reboot
+and try a different mirror.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/eo/netInstall-stage2.xml b/docs/docs/stable/bootiso/eo/netInstall-stage2.xml
new file mode 100644
index 00000000..ac3ab250
--- /dev/null
+++ b/docs/docs/stable/bootiso/eo/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/es/NetInstall-cover.xml b/docs/docs/stable/bootiso/es/NetInstall-cover.xml
index 62a37c51..16ac4010 100644
--- a/docs/docs/stable/bootiso/es/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/es/NetInstall-cover.xml
@@ -1,39 +1,56 @@
 <?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="es" 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="es" xml:id="NetInstall-cover">
   <info>
-    <title>Instalación con pequeña imagen</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">La herramienta para instalar Mageia con repositorios remotos</para>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>Los textos y capturas de pantalla de este manual están disponibles bajo la
+      <para>Los textos y capturas de pantalla de este manual están disponibles bajo la
 licencia CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-	    </para>
-	    <para>Éste manual ha sido realizado con la ayuda de <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Éste manual ha sido realizado con la ayuda de <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> desarrollado por <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>
-	    </para>
-            <para>Fue escrito por voluntarios en sus ratos libres. Por favor contacte con el
-<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipo de
-Documentación</link> si puede ayudar a mejorar este manual.</para>
+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/es/NetInstall.xml b/docs/docs/stable/bootiso/es/NetInstall.xml
index f3776957..9aa23c8d 100644
--- a/docs/docs/stable/bootiso/es/NetInstall.xml
+++ b/docs/docs/stable/bootiso/es/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="es" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="es" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Instalación con pequeña imagen</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -19,14 +37,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> desarrollado por <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
 
-      <para>Fue escrito por voluntarios en sus ratos libres. Por favor contacte con el
-<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipo de
-Documentación</link> si puede ayudar a mejorar este 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="bootIso.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/es/netInstall-intro.xml b/docs/docs/stable/bootiso/es/netInstall-intro.xml
new file mode 100644
index 00000000..fcc2fb6c
--- /dev/null
+++ b/docs/docs/stable/bootiso/es/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/es/netInstall-stage1.xml b/docs/docs/stable/bootiso/es/netInstall-stage1.xml
new file mode 100644
index 00000000..581bcd7b
--- /dev/null
+++ b/docs/docs/stable/bootiso/es/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-ayuda.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-bienvenido2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>Si obtiene muchos errores de dependencias, después de instalar, reinicie y
+pruebe con un espejo diferente.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/es/netInstall-stage2.xml b/docs/docs/stable/bootiso/es/netInstall-stage2.xml
new file mode 100644
index 00000000..ffe587ec
--- /dev/null
+++ b/docs/docs/stable/bootiso/es/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/et/netInstall-intro.xml b/docs/docs/stable/bootiso/et/netInstall-intro.xml
new file mode 100644
index 00000000..2238ecea
--- /dev/null
+++ b/docs/docs/stable/bootiso/et/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/et/netInstall-stage1.xml b/docs/docs/stable/bootiso/et/netInstall-stage1.xml
new file mode 100644
index 00000000..111c1cba
--- /dev/null
+++ b/docs/docs/stable/bootiso/et/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>Kui saate paigaldamise ajal rohkelt veateateid puuduvate sõltuvuste kohta,
+taaskäivitage arvuti ja valige mõni muu peegel.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/et/netInstall-stage2.xml b/docs/docs/stable/bootiso/et/netInstall-stage2.xml
new file mode 100644
index 00000000..cdd1dc8c
--- /dev/null
+++ b/docs/docs/stable/bootiso/et/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/eu/NetInstall-cover.xml b/docs/docs/stable/bootiso/eu/NetInstall-cover.xml
index e598f5cc..8b9a66ac 100644
--- a/docs/docs/stable/bootiso/eu/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/eu/NetInstall-cover.xml
@@ -1,39 +1,56 @@
 <?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="eu" 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="eu" xml:id="NetInstall-cover">
   <info>
-    <title>Instalazioa irudi txiki batekin</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">Mageia urrutiko biltegiekin instalatzeko tresna</para>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>Manual honetan jasotako testuak eta irudiak CC BY-SA 3.0 babespean daude
+      <para>Manual honetan jasotako testuak eta irudiak CC BY-SA 3.0 babespean daude
 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para><link ns6:href="http://www.calenco.com">Calenco CMS</link>-ren laguntzarekin
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para><link ns6:href="http://www.calenco.com">Calenco CMS</link>-ren laguntzarekin
 egin da eskuliburu hau <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>-k garatuta.
-	    </para>
-            <para>Boluntarioek beren aisialdian idatzi zuten. Zoaz <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentazio
-Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para>
+ns6:href="http://www.neodoc.biz">NeoDoc</link>-k garatuta.</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/eu/NetInstall.xml b/docs/docs/stable/bootiso/eu/NetInstall.xml
index 6919274e..993078d7 100644
--- a/docs/docs/stable/bootiso/eu/NetInstall.xml
+++ b/docs/docs/stable/bootiso/eu/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="eu" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="eu" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Instalazioa irudi txiki batekin</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -20,14 +38,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 egin da eskuliburu hau <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>-k garatuta.</para>
 
-      <para>Boluntarioek beren aisialdian idatzi zuten. Zoaz <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentazio
-Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</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="bootIso.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/eu/netInstall-intro.xml b/docs/docs/stable/bootiso/eu/netInstall-intro.xml
new file mode 100644
index 00000000..dcf901e7
--- /dev/null
+++ b/docs/docs/stable/bootiso/eu/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/eu/netInstall-stage1.xml b/docs/docs/stable/bootiso/eu/netInstall-stage1.xml
new file mode 100644
index 00000000..23024fde
--- /dev/null
+++ b/docs/docs/stable/bootiso/eu/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>Falta den mendekotasun asko jasotzen baduzu instalatzean, berrabiarazi eta
+beste ispilu bat probatu.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/eu/netInstall-stage2.xml b/docs/docs/stable/bootiso/eu/netInstall-stage2.xml
new file mode 100644
index 00000000..9e2a94fe
--- /dev/null
+++ b/docs/docs/stable/bootiso/eu/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/hr/NetInstall-cover.xml b/docs/docs/stable/bootiso/hr/NetInstall-cover.xml
index 2831592e..845fa7e7 100644
--- a/docs/docs/stable/bootiso/hr/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/hr/NetInstall-cover.xml
@@ -1,39 +1,56 @@
 <?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="hr" 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="hr" 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>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>The texts and screenshots in this manual are available under the CC BY-SA
+      <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://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="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/hr/NetInstall.xml b/docs/docs/stable/bootiso/hr/NetInstall.xml
index e8dfbd89..aeac2c86 100644
--- a/docs/docs/stable/bootiso/hr/NetInstall.xml
+++ b/docs/docs/stable/bootiso/hr/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="hr" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="hr" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Installation with tiny image</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -20,14 +38,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 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
+      <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="bootIso.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/hr/netInstall-intro.xml b/docs/docs/stable/bootiso/hr/netInstall-intro.xml
new file mode 100644
index 00000000..92c2eebb
--- /dev/null
+++ b/docs/docs/stable/bootiso/hr/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/hr/netInstall-stage1.xml b/docs/docs/stable/bootiso/hr/netInstall-stage1.xml
new file mode 100644
index 00000000..e7275e5a
--- /dev/null
+++ b/docs/docs/stable/bootiso/hr/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>If you get a lot of missing dependency errors later in the install, reboot
+and try a different mirror.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/hr/netInstall-stage2.xml b/docs/docs/stable/bootiso/hr/netInstall-stage2.xml
new file mode 100644
index 00000000..ec8cc0c9
--- /dev/null
+++ b/docs/docs/stable/bootiso/hr/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/hu/NetInstall-cover.xml b/docs/docs/stable/bootiso/hu/NetInstall-cover.xml
index 7ba1715b..610892b2 100644
--- a/docs/docs/stable/bootiso/hu/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/hu/NetInstall-cover.xml
@@ -1,39 +1,56 @@
 <?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="hu" 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="hu" xml:id="NetInstall-cover">
   <info>
-    <title>Telepítés apró lemezképekkel</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">A Mageia távoli  tárolóinak telepítéséhez szükséges eszköz</para>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>A kézikönyvben szereplő szövegek és képernyőképek  a CC BY-SA 3.0 licenc
+      <para>A kézikönyvben szereplő szövegek és képernyőképek  a CC BY-SA 3.0 licenc
 alatt érhetők el <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Ez a kézikönyv a<link ns6:href="http://www.neodoc.biz"> NeoDoc</link> által
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ez a kézikönyv a<link ns6:href="http://www.neodoc.biz"> NeoDoc</link> által
 kifejlesztett <link ns6:href="http://www.calenco.com">Calenco CMS</link>
-segítségével készült.
-	    </para>
-            <para>Az önkéntesek szabadidejükben írták. Kérjük, lépjen kapcsolatba a <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentációs
-csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para>
+segítségével készült.</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/hu/NetInstall.xml b/docs/docs/stable/bootiso/hu/NetInstall.xml
index c29bc751..f3f12919 100644
--- a/docs/docs/stable/bootiso/hu/NetInstall.xml
+++ b/docs/docs/stable/bootiso/hu/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="hu" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="hu" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Telepítés apró lemezképekkel</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -20,14 +38,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 kifejlesztett <link ns6:href="http://www.calenco.com">Calenco CMS</link>
 segítségével készült.</para>
 
-      <para>Az önkéntesek szabadidejükben írták. Kérjük, lépjen kapcsolatba a <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentációs
-csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</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="bootIso.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/hu/netInstall-intro.xml b/docs/docs/stable/bootiso/hu/netInstall-intro.xml
new file mode 100644
index 00000000..db71fb60
--- /dev/null
+++ b/docs/docs/stable/bootiso/hu/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/hu/netInstall-stage1.xml b/docs/docs/stable/bootiso/hu/netInstall-stage1.xml
new file mode 100644
index 00000000..d1b82808
--- /dev/null
+++ b/docs/docs/stable/bootiso/hu/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>Ha sok hiányzó függőségi hibát kap a telepítés után, akkor indítsa újra és
+próbálkozzon egy másik tükörrel.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/hu/netInstall-stage2.xml b/docs/docs/stable/bootiso/hu/netInstall-stage2.xml
new file mode 100644
index 00000000..617a3b55
--- /dev/null
+++ b/docs/docs/stable/bootiso/hu/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/ja/netInstall-intro.xml b/docs/docs/stable/bootiso/ja/netInstall-intro.xml
new file mode 100644
index 00000000..68171efc
--- /dev/null
+++ b/docs/docs/stable/bootiso/ja/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ja" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/ja/netInstall-stage1.xml b/docs/docs/stable/bootiso/ja/netInstall-stage1.xml
new file mode 100644
index 00000000..d16ce98d
--- /dev/null
+++ b/docs/docs/stable/bootiso/ja/netInstall-stage1.xml
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ja" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>もしインストール中に依存関係についてのエラーがたくさん出る場合、再起動して異なるミラーを試してください。</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/ja/netInstall-stage2.xml b/docs/docs/stable/bootiso/ja/netInstall-stage2.xml
new file mode 100644
index 00000000..7b5f5295
--- /dev/null
+++ b/docs/docs/stable/bootiso/ja/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ja" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/nl/NetInstall-cover.xml b/docs/docs/stable/bootiso/nl/NetInstall-cover.xml
index 34a5e178..c34450d4 100644
--- a/docs/docs/stable/bootiso/nl/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/nl/NetInstall-cover.xml
@@ -1,41 +1,57 @@
 <?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="nl" 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="nl" xml:id="NetInstall-cover">
   <info>
-    <title>Installatie kleine kopie (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">Het hulpprogramma om Mageia te installeren met behulp van externe
 pakketbronnen</para>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>De teksten en de screenshots in deze handleiding zijn beschikbaar onder de
+      <para>De teksten en de screenshots in deze handleiding zijn beschikbaar onder de
 CC BY-SA 3.0 licentie <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-	    </para>
-	    <para>Deze handleiding werd geproduceerd met behulp van het <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Deze handleiding werd geproduceerd met behulp van het <link
 ns6:href="http://www.calenco.com">Calenco CMS</link>, ontwikkeld door <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>
-	    </para>
-            <para>Ze werd door vrijwilligers in hun vrije tijd geschreven. Neem a.u.b. contact
-op met het <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentatie
-Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para>
+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/nl/NetInstall.xml b/docs/docs/stable/bootiso/nl/NetInstall.xml
index 0cf79a4f..d0d68b8a 100644
--- a/docs/docs/stable/bootiso/nl/NetInstall.xml
+++ b/docs/docs/stable/bootiso/nl/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="nl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="nl" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Installatie kleine kopie (image)</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -20,15 +38,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link>, ontwikkeld door <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
 
-      <para>Ze werd door vrijwilligers in hun vrije tijd geschreven. Neem a.u.b. contact
-op met het <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentatie
-Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</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="bootIso.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/nl/netInstall-intro.xml b/docs/docs/stable/bootiso/nl/netInstall-intro.xml
new file mode 100644
index 00000000..278ca151
--- /dev/null
+++ b/docs/docs/stable/bootiso/nl/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/nl/netInstall-stage1.xml b/docs/docs/stable/bootiso/nl/netInstall-stage1.xml
new file mode 100644
index 00000000..d54b56ff
--- /dev/null
+++ b/docs/docs/stable/bootiso/nl/netInstall-stage1.xml
@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>Als u een heleboel ontbrekende afhankelijkheidsfouten later in de
+installatie te zien krijgt, start dan opnieuw op en probeer een andere
+spiegelserver.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/nl/netInstall-stage2.xml b/docs/docs/stable/bootiso/nl/netInstall-stage2.xml
new file mode 100644
index 00000000..24b612e2
--- /dev/null
+++ b/docs/docs/stable/bootiso/nl/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/pt/NetInstall-cover.xml b/docs/docs/stable/bootiso/pt/NetInstall-cover.xml
index 9601414a..5c341e84 100644
--- a/docs/docs/stable/bootiso/pt/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/pt/NetInstall-cover.xml
@@ -1,39 +1,56 @@
 <?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="pt" 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="pt" 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>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>The texts and screenshots in this manual are available under the CC BY-SA
+      <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://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="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/pt/NetInstall.xml b/docs/docs/stable/bootiso/pt/NetInstall.xml
index ff24e7be..686b334f 100644
--- a/docs/docs/stable/bootiso/pt/NetInstall.xml
+++ b/docs/docs/stable/bootiso/pt/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="pt" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="pt" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Installation with tiny image</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -20,14 +38,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 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
+      <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="bootIso.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/pt/netInstall-intro.xml b/docs/docs/stable/bootiso/pt/netInstall-intro.xml
new file mode 100644
index 00000000..21b77e65
--- /dev/null
+++ b/docs/docs/stable/bootiso/pt/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/pt/netInstall-stage1.xml b/docs/docs/stable/bootiso/pt/netInstall-stage1.xml
new file mode 100644
index 00000000..314bb0b5
--- /dev/null
+++ b/docs/docs/stable/bootiso/pt/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>If you get a lot of missing dependency errors later in the install, reboot
+and try a different mirror.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/pt/netInstall-stage2.xml b/docs/docs/stable/bootiso/pt/netInstall-stage2.xml
new file mode 100644
index 00000000..0d46b843
--- /dev/null
+++ b/docs/docs/stable/bootiso/pt/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/sl/NetInstall-cover.xml b/docs/docs/stable/bootiso/sl/NetInstall-cover.xml
index 9e4ae4b5..6743aaf8 100644
--- a/docs/docs/stable/bootiso/sl/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/sl/NetInstall-cover.xml
@@ -1,38 +1,55 @@
 <?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="sl" 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="sl" xml:id="NetInstall-cover">
   <info>
-    <title>Namestitev z majhno datoteko odtisa diska</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">Orodje za namestitev distribucije Mageia s pomočjo oddaljenih skladišč</para>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>Besedilo in zaslonski posnetki so licencirani z CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Ta navodila so bila ustvarjena s pomočjo orodja <link
+      <para>Besedilo in zaslonski posnetki so licencirani z CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ta navodila so bila ustvarjena s pomočjo orodja <link
 ns6:href="http://www.calenco.com">Calenco CMS</link>, ki ga je razvila firma
-<link ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>Napisali smo jih prostovoljci v svojem prostem času. Obrnite se na <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">ekipo za
-dokumentiranje</link>, če jih želite izboljšati.</para>
+<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/sl/NetInstall.xml b/docs/docs/stable/bootiso/sl/NetInstall.xml
index def7e6c1..75b4f2fd 100644
--- a/docs/docs/stable/bootiso/sl/NetInstall.xml
+++ b/docs/docs/stable/bootiso/sl/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="sl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="sl" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Namestitev z majhno datoteko odtisa diska</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -19,14 +37,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link>, ki ga je razvila firma
 <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>Napisali smo jih prostovoljci v svojem prostem času. Obrnite se na <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">ekipo za
-dokumentiranje</link>, če jih želite izboljšati.</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="bootIso.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/sl/netInstall-intro.xml b/docs/docs/stable/bootiso/sl/netInstall-intro.xml
new file mode 100644
index 00000000..a9bd09e1
--- /dev/null
+++ b/docs/docs/stable/bootiso/sl/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/sl/netInstall-stage1.xml b/docs/docs/stable/bootiso/sl/netInstall-stage1.xml
new file mode 100644
index 00000000..8d1adda4
--- /dev/null
+++ b/docs/docs/stable/bootiso/sl/netInstall-stage1.xml
@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>V primeru, da se kasneje v namestitvi pojavi več napak z manjkajočimi
+odvisnostmi, ponovno zaženite računalnik ter ponovite namestitev, a z
+drugega zrcala.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/sl/netInstall-stage2.xml b/docs/docs/stable/bootiso/sl/netInstall-stage2.xml
new file mode 100644
index 00000000..aa103112
--- /dev/null
+++ b/docs/docs/stable/bootiso/sl/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/sq/NetInstall-cover.xml b/docs/docs/stable/bootiso/sq/NetInstall-cover.xml
index 648905e6..c1449150 100644
--- a/docs/docs/stable/bootiso/sq/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/sq/NetInstall-cover.xml
@@ -1,39 +1,56 @@
 <?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="sq" 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="sq" 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>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>The texts and screenshots in this manual are available under the CC BY-SA
+      <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>Ky manual është prodhuar me ndihmën e <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ky manual është prodhuar me ndihmën e <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> zhvilluar nga <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>Është shkruar nga vullnetarë në kohën e tyre të lirë. Ju lutem kontaktoni
-<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Ekipi
-Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para>
+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/sq/NetInstall.xml b/docs/docs/stable/bootiso/sq/NetInstall.xml
index 5a36cb14..56c1f4ea 100644
--- a/docs/docs/stable/bootiso/sq/NetInstall.xml
+++ b/docs/docs/stable/bootiso/sq/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="sq" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="sq" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Installation with tiny image</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -20,14 +38,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> zhvilluar nga <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>Është shkruar nga vullnetarë në kohën e tyre të lirë. Ju lutem kontaktoni
-<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Ekipi
-Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë 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="bootIso.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/sq/netInstall-intro.xml b/docs/docs/stable/bootiso/sq/netInstall-intro.xml
new file mode 100644
index 00000000..0916a63e
--- /dev/null
+++ b/docs/docs/stable/bootiso/sq/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/sq/netInstall-stage1.xml b/docs/docs/stable/bootiso/sq/netInstall-stage1.xml
new file mode 100644
index 00000000..097c0d32
--- /dev/null
+++ b/docs/docs/stable/bootiso/sq/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>If you get a lot of missing dependency errors later in the install, reboot
+and try a different mirror.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/sq/netInstall-stage2.xml b/docs/docs/stable/bootiso/sq/netInstall-stage2.xml
new file mode 100644
index 00000000..e759a107
--- /dev/null
+++ b/docs/docs/stable/bootiso/sq/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/sv/NetInstall-cover.xml b/docs/docs/stable/bootiso/sv/NetInstall-cover.xml
index cb56a6f1..73eff6ac 100644
--- a/docs/docs/stable/bootiso/sv/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/sv/NetInstall-cover.xml
@@ -1,39 +1,56 @@
 <?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="sv" 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="sv" xml:id="NetInstall-cover">
   <info>
-    <title>Installation med en pytteliten avbild</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">Ett verktyg för att installera Mageia via fjärrförråd</para>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>Texter och skärmdumpar i denna manual finns under CC BY-SA 3.0 licensen
+      <para>Texter och skärmdumpar i denna manual finns under CC BY-SA 3.0 licensen
 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-	    </para>
-	    <para>Denna manual är producerad med hjälp av <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Denna manual är producerad med hjälp av <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> utvecklad av <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>
-	    </para>
-            <para>Den är skriven av frivilliga på deras fritid. Kontakta <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentations-teamet</link>
-om du vill hjälpa till och förbättra den här manualen.</para>
+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/sv/NetInstall.xml b/docs/docs/stable/bootiso/sv/NetInstall.xml
index ae680fb8..87f5a803 100644
--- a/docs/docs/stable/bootiso/sv/NetInstall.xml
+++ b/docs/docs/stable/bootiso/sv/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="sv" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="sv" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Installation med en pytteliten avbild</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -20,14 +38,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> utvecklad av <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
 
-      <para>Den är skriven av frivilliga på deras fritid. Kontakta <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentations-teamet</link>
-om du vill hjälpa till och förbättra den här manualen.</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="bootIso.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/sv/netInstall-intro.xml b/docs/docs/stable/bootiso/sv/netInstall-intro.xml
new file mode 100644
index 00000000..ea520c35
--- /dev/null
+++ b/docs/docs/stable/bootiso/sv/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/sv/netInstall-stage1.xml b/docs/docs/stable/bootiso/sv/netInstall-stage1.xml
new file mode 100644
index 00000000..4d9a71bc
--- /dev/null
+++ b/docs/docs/stable/bootiso/sv/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>Om du får en massa beroendefel senare under installationen så starta om och
+försök med en annan spegel.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/sv/netInstall-stage2.xml b/docs/docs/stable/bootiso/sv/netInstall-stage2.xml
new file mode 100644
index 00000000..795e86bf
--- /dev/null
+++ b/docs/docs/stable/bootiso/sv/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/tg/NetInstall-cover.xml b/docs/docs/stable/bootiso/tg/NetInstall-cover.xml
index c5cfa9fe..a72d5774 100644
--- a/docs/docs/stable/bootiso/tg/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/tg/NetInstall-cover.xml
@@ -1,42 +1,57 @@
 <?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="tg" 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="tg" xml:id="NetInstall-cover">
   <info>
-    <title>Насбкунӣ бо тасвири хурд</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">Абзор барои насб кардани системаи оператсионии Mageia ба воситаи анборҳои
 нармафзори дурдаст</para>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>Матн ва аксҳои ин дастурамал мувофиқи шартҳои Иҷозатномаи CC BY-SA 3.0 <link
+      <para>Матн ва аксҳои ин дастурамал мувофиқи шартҳои Иҷозатномаи CC BY-SA 3.0 <link
 ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-дастрасанд.
-	    </para>
-	    <para>Ин дастурамал ба воситаи барномаи <link
+дастрасанд.</para>
+
+      <para>Ин дастурамал ба воситаи барномаи <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> аз ширкати <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link> таҳия карда шудааст.
-	    </para>
-            <para>Ин дастурамал бо мутахассисон ба тариқи ихтиёрӣ дар вақти озод аз кор таҳия
-карда шудааст. Барои маълумоти муфассал бо <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Дастаи
-ҳуҷҷатнигорӣ</link> дар тамос шавед, агар хоҳед, ки дастурамали ҷориро
-мукаммал созед.</para>
+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/tg/NetInstall.xml b/docs/docs/stable/bootiso/tg/NetInstall.xml
index 44a5c7b4..99398ae2 100644
--- a/docs/docs/stable/bootiso/tg/NetInstall.xml
+++ b/docs/docs/stable/bootiso/tg/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="tg" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="tg" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Насбкунӣ бо тасвири хурд</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -20,16 +38,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> аз ширкати <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link> таҳия карда шудааст.</para>
 
-      <para>Ин дастурамал бо мутахассисон ба тариқи ихтиёрӣ дар вақти озод аз кор таҳия
-карда шудааст. Барои маълумоти муфассал бо <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Дастаи
-ҳуҷҷатнигорӣ</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>
+
   
+
   
 
-  <xi:include href="bootIso.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/tg/netInstall-intro.xml b/docs/docs/stable/bootiso/tg/netInstall-intro.xml
new file mode 100644
index 00000000..a175d04b
--- /dev/null
+++ b/docs/docs/stable/bootiso/tg/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/tg/netInstall-stage1.xml b/docs/docs/stable/bootiso/tg/netInstall-stage1.xml
new file mode 100644
index 00000000..d6d6c1e9
--- /dev/null
+++ b/docs/docs/stable/bootiso/tg/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>Агар каме пас бисёр хатоҳои вобаста ба раванди насб намоиш дода шаванд,
+системаро бозоғозӣ кунед ва оинаи дигареро кӯшиш намоед.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/tg/netInstall-stage2.xml b/docs/docs/stable/bootiso/tg/netInstall-stage2.xml
new file mode 100644
index 00000000..fc4990f1
--- /dev/null
+++ b/docs/docs/stable/bootiso/tg/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/tr/NetInstall-cover.xml b/docs/docs/stable/bootiso/tr/NetInstall-cover.xml
index d9fdfa27..9634ba0a 100644
--- a/docs/docs/stable/bootiso/tr/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/tr/NetInstall-cover.xml
@@ -1,40 +1,56 @@
 <?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="tr" 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="tr" xml:id="NetInstall-cover">
   <info>
-    <title>Ufak imaj ile kurulum</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">Uzak veri kaynaklarıyla Mageia'yı kurmak için bir araç</para>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>Bu el kitabındaki ekran görüntüleri ve metinler CC BY-SA3.0 ile
+      <para>Bu el kitabındaki ekran görüntüleri ve metinler CC BY-SA3.0 ile
 lisanslanmıştır <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Bu el kitabı, <link ns6:href="http://www.neodoc.biz">NeoDoc</link>
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Bu el kitabı, <link ns6:href="http://www.neodoc.biz">NeoDoc</link>
 tarafından geliştirilen <link ns6:href="http://www.calenco.com">Calenco
-CMS</link> yardımıyla hazırlanmıştır.
-	    </para>
-            <para>Gönüllüler tarafından onların boş zamanlarında yazılmıştır. Bu rehberin
-geliştirilmesine yardım etmek için lütfen <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Belgelendirme
-Takımı</link> ile iletişime geçin. </para>
+CMS</link> yardımıyla hazırlanmıştır.</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/tr/NetInstall.xml b/docs/docs/stable/bootiso/tr/NetInstall.xml
index 455c3388..8631e0a3 100644
--- a/docs/docs/stable/bootiso/tr/NetInstall.xml
+++ b/docs/docs/stable/bootiso/tr/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="tr" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="tr" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Ufak imaj ile kurulum</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -20,15 +38,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 tarafından geliştirilen <link ns6:href="http://www.calenco.com">Calenco
 CMS</link> yardımıyla hazırlanmıştır.</para>
 
-      <para>Gönüllüler tarafından onların boş zamanlarında yazılmıştır. Bu rehberin
-geliştirilmesine yardım etmek için lütfen <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Belgelendirme
-Takımı</link> ile iletişime geçin. </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="bootIso.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/tr/netInstall-intro.xml b/docs/docs/stable/bootiso/tr/netInstall-intro.xml
new file mode 100644
index 00000000..60b33197
--- /dev/null
+++ b/docs/docs/stable/bootiso/tr/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/tr/netInstall-stage1.xml b/docs/docs/stable/bootiso/tr/netInstall-stage1.xml
new file mode 100644
index 00000000..af3b8065
--- /dev/null
+++ b/docs/docs/stable/bootiso/tr/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>Kurulumda çokça eksik bağımlılık hatası alıyorsanız bilgisayarınızı yeniden
+başlatın ve farklı bir yansı deneyin.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/tr/netInstall-stage2.xml b/docs/docs/stable/bootiso/tr/netInstall-stage2.xml
new file mode 100644
index 00000000..4130e597
--- /dev/null
+++ b/docs/docs/stable/bootiso/tr/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/zh_CN/NetInstall-cover.xml b/docs/docs/stable/bootiso/zh_CN/NetInstall-cover.xml
index 9aeada8b..765b0f79 100644
--- a/docs/docs/stable/bootiso/zh_CN/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/zh_CN/NetInstall-cover.xml
@@ -1,36 +1,54 @@
 <?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="zh_CN" 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="zh_CN" xml:id="NetInstall-cover">
   <info>
-    <title>使用微型镜像来安装</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">使用远程仓库来安装Mageia的工具</para>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>此手册中的文本和屏幕截图以 CC BY-SA 3.0 协议（<link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>）发布。
-	    </para>
-	    <para>此手册由 <link ns6:href="http://www.neodoc.biz">NeoDoc</link> 开发的 <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> 生成。
-	    </para>
-            <para>内容由志愿者编写。若您希望完善此手册，请联系 <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。</para>
+      <para>此手册中的文本和屏幕截图以 CC BY-SA 3.0 协议（<link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>）发布。</para>
+
+      <para>此手册由 <link ns6:href="http://www.neodoc.biz">NeoDoc</link> 开发的 <link
+ns6:href="http://www.calenco.com">Calenco CMS</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/zh_CN/NetInstall.xml b/docs/docs/stable/bootiso/zh_CN/NetInstall.xml
index d28142e2..2e0c3747 100644
--- a/docs/docs/stable/bootiso/zh_CN/NetInstall.xml
+++ b/docs/docs/stable/bootiso/zh_CN/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="zh_CN" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="zh_CN" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>使用微型镜像来安装</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -16,13 +34,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
       <para>此手册由 <link ns6:href="http://www.neodoc.biz">NeoDoc</link> 开发的 <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> 生成。</para>
 
-      <para>内容由志愿者编写。若您希望完善此手册，请联系 <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</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>
+
   
+
   
 
-  <xi:include href="bootIso.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/zh_CN/netInstall-intro.xml b/docs/docs/stable/bootiso/zh_CN/netInstall-intro.xml
new file mode 100644
index 00000000..63af82fd
--- /dev/null
+++ b/docs/docs/stable/bootiso/zh_CN/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/zh_CN/netInstall-stage1.xml b/docs/docs/stable/bootiso/zh_CN/netInstall-stage1.xml
new file mode 100644
index 00000000..cad60191
--- /dev/null
+++ b/docs/docs/stable/bootiso/zh_CN/netInstall-stage1.xml
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>如果您在后续的安装过程中遇到大量依赖缺失的问题，请重启并改用其他镜像。</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/zh_CN/netInstall-stage2.xml b/docs/docs/stable/bootiso/zh_CN/netInstall-stage2.xml
new file mode 100644
index 00000000..1efdd828
--- /dev/null
+++ b/docs/docs/stable/bootiso/zh_CN/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/bootiso/zh_TW/NetInstall-cover.xml b/docs/docs/stable/bootiso/zh_TW/NetInstall-cover.xml
index 05b9d9d6..eeb4b20a 100644
--- a/docs/docs/stable/bootiso/zh_TW/NetInstall-cover.xml
+++ b/docs/docs/stable/bootiso/zh_TW/NetInstall-cover.xml
@@ -1,39 +1,56 @@
 <?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="zh_TW" 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="zh_TW" 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>
+
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
 
-	    <para>The texts and screenshots in this manual are available under the CC BY-SA
+      <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://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="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/zh_TW/NetInstall.xml b/docs/docs/stable/bootiso/zh_TW/NetInstall.xml
index 2bc497a3..bf86aace 100644
--- a/docs/docs/stable/bootiso/zh_TW/NetInstall.xml
+++ b/docs/docs/stable/bootiso/zh_TW/NetInstall.xml
@@ -1,9 +1,27 @@
-<?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="zh_TW" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="zh_TW" 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">
   <!-- <xi:include href="drakx-intro.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 -->
 <info>
-    <title>Installation with tiny image</title>
+    <title>Mageia NetInstall</title>
+
+    <subtitle>Installing Mageia Using a Tiny Boot Image</subtitle>
 
     <cover>
       <para><note>
@@ -20,14 +38,23 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 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
+      <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="bootIso.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/zh_TW/netInstall-intro.xml b/docs/docs/stable/bootiso/zh_TW/netInstall-intro.xml
new file mode 100644
index 00000000..40672c65
--- /dev/null
+++ b/docs/docs/stable/bootiso/zh_TW/netInstall-intro.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-stage1.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<title>Introduction</title>
+
+  <section>
+    <title>NetInstall Media</title>
+
+    <section>
+      <title>Description</title>
+
+      <para>These minimal ISO's contain:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>less than 100 MB and are convenient if bandwidth is too low to download a
+full DVD, or if you have a PC without a DVD drive or unable to boot from a
+USB stick.</para>
+        </listitem>
+
+        <listitem>
+          <para>no more than that which is needed to a) start the <literal>DrakX</literal>
+installer and b) find <literal>DrakX-installer-stage2</literal> and other
+packages that are needed to continue and complete the install.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>The required source packages may be on a PC hard disk, a local drive, a
+local network or on the Internet.</para>
+
+      <note>
+        <para>Installation via encrypted wifi or bluetooth is not supported.</para>
+      </note>
+    </section>
+
+    <section>
+      <title>Availability</title>
+
+      <para>There a two versions of the NetInstall media:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">netinstall.iso</emphasis> For those who prefer not to
+use non-free software, this ISO contains only free software.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">netinstall-nonfree.iso</emphasis> This ISO
+additionally includes proprietary device drivers, which may be required for
+your network device, disk controller, etc.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Both versions are available in the form of separate 32-bit and 64-bit
+ISO's. See here: <link
+xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/en/downloads/</link></para>
+    </section>
+
+    <section>
+      <title>Preparation</title>
+
+      <para>After downloading the image, burn it to a CD/DVD or, if you prefer to put it
+on a USB stick, follow the instructions here: <link
+xlink:href="https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick">https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick</link></para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Stages</title>
+
+    <para>The installation is carried out in two stages:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Stage 1</emphasis> This is the pre-Installation
+stage. You will need to provide the method and details for accessing the
+medium containing the files to be used for the installation. If the method
+involves a server, then the network connection will be activated.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Stage 2</emphasis> This is the actual Installation
+stage, which will automatically commence once a connection to the installer
+files has been established.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>During Stage 1, nothing will be written to your Hard Disk, so it is safe to
+quit at any point during Stage 1 if you wish. You can do so by pressing
+<keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Del</keycap>
+</keycombo>.</para>
+    </note>
+
+    <tip>
+      <para>You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo>
+to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap>
+</keycombo> to return to the installer screen.</para>
+    </tip>
+
+    <warning>
+      <para>Unlike when installing from DVD or LiveCD, during the first part of the
+installation (<emphasis role="bold">Stage 1</emphasis>), you will be asked
+to type things. During this stage, your keyboard will operate as per an
+<link
+xlink:href="https://en.wikipedia.org/wiki/Keyboard_layout#United_States">American
+keyboard</link> layout. This can be very confusing when you need to type
+names and paths.</para>
+    </warning>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/zh_TW/netInstall-stage1.xml b/docs/docs/stable/bootiso/zh_TW/netInstall-stage1.xml
new file mode 100644
index 00000000..4cc34b3c
--- /dev/null
+++ b/docs/docs/stable/bootiso/zh_TW/netInstall-stage1.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
+<!-- 2019/01/06 apb: typo 2.2.2) -->
+<title>Stage 1 (Pre-installation Stage)</title>
+
+  <section>
+    <title>Boot</title>
+
+    <para>The particular <emphasis>Welcome Screen</emphasis> that you will see when
+booting with the NetInstall media depends on whether you are booting on a
+BIOS or UEFI system. See the following two screenshots:</para>
+
+    <figure>
+      <title>BIOS Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-help.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <para>When booting up, you can choose to read the advanced help by pressing
+<keycap>F2</keycap> and return to the installer screen by pressing
+<keycap>F1</keycap>. Otherwise, the boot will continue with default
+settings.</para>
+
+    <figure>
+      <title>UEFI Welcome Screen</title>
+
+<mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../dx-welcome2.png"/>
+        </imageobject>
+      </mediaobject></figure>
+
+    <itemizedlist>
+      <listitem>
+        <para>Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis>
+and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For both BIOS and UEFI systems, you will then see a pop-up notification
+saying that USB devices are being detected:</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-01.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section xreflabel="Installation Method" xml:id="installMethod">
+    <title>Installation Method</title>
+
+    <para>You can now choose an installation method via CDROM/HDD or Server (NFS, FTP
+or HTTP).</para>
+
+    <para>You also have the option to load third-party modules at this point.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-02.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <itemizedlist>
+      <listitem>
+        <para>Move up or down the list using the arrow keys until the appropriate method
+of installation is highlighted.</para>
+      </listitem>
+
+      <listitem>
+        <para>Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is
+highlighted and then press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <section>
+      <title>Server</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you don't know what to choose for a Network Installation, choose
+<emphasis>FTP server</emphasis>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On an enterprise network, FTP and rsync may be blocked, so using
+<emphasis>HTTP server</emphasis> is a good choice in this case.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>After choosing any of the server options you will automatically proceed to
+the <emphasis><xref linkend="netConn"/></emphasis> section.</para>
+    </section>
+
+    <section>
+      <title>CDROM/HDD</title>
+
+      <para>If you choose to install from either a CDROM or hard disk (or USB stick), a
+scan for storage devices will be performed:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-03.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>First, select the relevant hard drive (or USB stick)</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-04.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Followed by the relevant partition</para>
+        </listitem>
+      </itemizedlist>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-05.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>Then specify the directory or the file name of the ISO</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>Leaving this open, or using the directory is easier, because the installer
+then presents you with a list of directories and files from which you can
+make your selection using the up and down arrows, as seen in the second of
+the following images.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-06.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-07.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once the information has been provided for the location of the ISO, either
+on CDROM or HDD, you will automatically proceed to <emphasis><xref
+linkend="netStageTwo"/></emphasis> (the actual installation stage).</para>
+    </section>
+
+    <section>
+      <title>Load Third-Party Modules</title>
+
+      <para>If you wish to <emphasis>Load third-party modules</emphasis>, then you will
+be asked for the location of the directory containing the modules:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-08.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+  </section>
+
+  <section xreflabel="Network Connection" xml:id="netConn">
+    <title>Network Connection</title>
+
+    <section>
+      <title>Connection Device</title>
+
+      <para>If you chose any of the server options at the <emphasis>Installation
+Method</emphasis> step, you will then be asked to choose a network device:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-09.png"/>
+        </imageobject>
+      </mediaobject>
+    </section>
+
+    <section>
+      <title>Connection Type</title>
+
+      <para>Now you need to choose whether the network device will use a DHCP, Static or
+ADSL connection:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-10.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are unsure which option is suitable, then you should probably accept
+the default option (DHCP).</para>
+    </section>
+
+    <section>
+      <title>Host/Domain Names</title>
+
+      <para>If necessary, you can now supply your Host and Domain names:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-11.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <itemizedlist>
+        <listitem>
+          <para>If you are unsure what this means then you can just leave the fields blank,
+highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to
+proceed. The network connection will now be activated.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you are using either FTP or HTTP, you will automatically proceed to the
+<emphasis><xref linkend="netMirrors"/></emphasis> section</para>
+
+      <para>If you are using NFS, you will be asked for the NFS server name and the
+directory containing the Mageia distribution:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-12.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After entering the NFS details, <emphasis><xref
+linkend="netStageTwo"/></emphasis> you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+
+  <section xreflabel="Mirrors" xml:id="netMirrors">
+    <title>Mirrors</title>
+
+    <para>If using FTP or HTTP, you now have to specify a mirror to use. This can be
+done manually or by choosing from a list</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata align="center" fileref="../netInstall-13.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <section>
+      <title>Specify Manually</title>
+
+      <para>You will find a list of all available mirrors here: <link
+xlink:href="http://mirrors.mageia.org/">http://mirrors.mageia.org/</link></para>
+
+      <para>Whichever mirror you choose, it should use the same tree-like structure from
+"mageia" (or "Mageia") as used by the official Mageia mirrors. That means
+.../mageia/distrib/&lt;version&gt;/&lt;arch&gt;</para>
+
+      <para>A correct entry (when using an official mirror) in the <emphasis>Mageia
+directory</emphasis> field below, could be:</para>
+
+      <para><filename>pub/linux/mageia/distrib/cauldron/i586</filename></para>
+
+      <para>Another example (for Mageia 6 x86_64) could be:</para>
+
+      <para><filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename></para>
+
+      <para>Other mirrors may have a different path structure and the screenshots below
+show such examples:</para>
+
+      <para>If you are using an FTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-14.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>If you are using an HTTP server:</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-15.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+
+    <section>
+      <title>Select From a List</title>
+
+      <para>If you get a lot of missing dependency errors later in the install, reboot
+and try a different mirror.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-16.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>After choosing an FTP server, you will see a screen where you can optionally
+add a login name and password if required.</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="../netInstall-17.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Once this information has been provided, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/bootiso/zh_TW/netInstall-stage2.xml b/docs/docs/stable/bootiso/zh_TW/netInstall-stage2.xml
new file mode 100644
index 00000000..0042f5ef
--- /dev/null
+++ b/docs/docs/stable/bootiso/zh_TW/netInstall-stage2.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xreflabel="Stage 2" xml:id="netStageTwo"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:ns6="http://docbook.org/ns/transclusion"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  
+
+  <!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+<title>Stage 2 (Installation Stage)</title>
+
+  <para>Nothing has been written to your hard disk at this point. Therefore, if you
+decide not to proceed with the actual installation, then it is safe to
+reboot now: go to <literal>tty2</literal> with <keycombo>
+<keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>F2</keycap> </keycombo>
+and press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Del</keycap> </keycombo> (or <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F7</keycap> </keycombo> to come back if you
+change your mind).</para>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  <xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/bg/DrakLive-cover.xml b/docs/docs/stable/installer/bg/DrakLive-cover.xml
index 5f7b4619..a6026874 100644
--- a/docs/docs/stable/installer/bg/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/bg/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="bg" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="bg" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Инсталиране от ЖИВ образ</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Януари 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Инсталиране от ЖИВ образ</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Официалната документация на Mageia</para>
+      <para role="tagline">Официалната документация на Mageia</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
+<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://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="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> 
+Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
+
   <article>
     <title>Инсталиране от ЖИВ образ</title>
-       <para><note>
-          <para>No one will see all the installer screens that you see in this manual. Which
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
 screens you will see, depends on your hardware and the choices you make
 while installing.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/bg/DrakLive.xml b/docs/docs/stable/installer/bg/DrakLive.xml
index 4f4200d8..7e1277de 100644
--- a/docs/docs/stable/installer/bg/DrakLive.xml
+++ b/docs/docs/stable/installer/bg/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="bg" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="bg" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Инсталиране от ЖИВ образ</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Инсталиране от ЖИВ образ</title>
 
     <cover>
       <para><note>
@@ -17,7 +32,7 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 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
+      <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>
@@ -39,7 +54,12 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +69,18 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/bg/DrakX-cover.xml b/docs/docs/stable/installer/bg/DrakX-cover.xml
index 23a317b1..dc9b8bd6 100644
--- a/docs/docs/stable/installer/bg/DrakX-cover.xml
+++ b/docs/docs/stable/installer/bg/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="bg" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="bg" xml:id="Quick-Startup"
+      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>Инсталация с DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Февруари 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Февруари 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Официалната документация на Mageia</para>
+      <para role="tagline">Официалната документация на Mageia</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
+
+      <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://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="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> 
+Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Инсталация с DrakX</title>
-       <para><note>
-          <para>No one will see all the installer screens that you see in this manual. Which
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
 screens you will see, depends on your hardware and the choices you make
 while installing.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ while installing.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/bg/DrakX-inline.xml b/docs/docs/stable/installer/bg/DrakX-inline.xml
new file mode 100644
index 00000000..e12ae1f4
--- /dev/null
+++ b/docs/docs/stable/installer/bg/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="bg" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Инсталация с DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the 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>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>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/DrakX.xml b/docs/docs/stable/installer/bg/DrakX.xml
index 505089e3..78653065 100644
--- a/docs/docs/stable/installer/bg/DrakX.xml
+++ b/docs/docs/stable/installer/bg/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="bg" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="bg" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Инсталация с DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Инсталация с DrakX</title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ Team</link>, if you would like to help improve this manual.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ Team</link>, if you would like to help improve this manual.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ Team</link>, if you would like to help improve this manual.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ Team</link>, if you would like to help improve this manual.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/bg/SelectAndUseISOs2.xml b/docs/docs/stable/installer/bg/SelectAndUseISOs2.xml
index 740c4bfa..ad7e9440 100644
--- a/docs/docs/stable/installer/bg/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/bg/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="bg" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
   </info>
   <section>
     <title>Въведение</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
-    <para>There are two families of media:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: Booting with this media provides you with the maximum
-flexibility when choosing what to install, and for configuring your
-system. In particular, you have a choice of which Desktop environment to
-install</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: This option allows you to try out Mageia without having to
-actually install it, or make any changes to your computer.  If the
-installation is decided, the process is simpler, but you get fewer choices
-than offered by the Classical installer</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Details are given in the next sections.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Media</title>
     <section>
       <title>Definition</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support (DVD, USB
-stick, ...) the ISO file is copied to.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
@@ -43,24 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the Classical installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
             <para>They are used for performing clean installs or to upgrade a previously
-installed version of Mageia.</para>
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Some tools are available in the Welcome screen: Rescue System, Memory Test,
-Hardware Detection Tool.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Each DVD contains many available desktop environments and languages.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>You'll be given the choice during the installation to add non free software.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -72,21 +107,19 @@ Hardware Detection Tool.</para>
         <itemizedlist>
           <listitem>
             <para>Can be used to preview the Mageia operating system without having to install
-it. Can also be used to install Mageia if you wish.</para>
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade previously installed Mageia
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>They contain non free software.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -94,13 +127,13 @@ releases.</emphasis></para>
         <title>Live DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Plasma desktop environment only.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -108,13 +141,13 @@ releases.</emphasis></para>
         <title>Live DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>GNOME desktop environment only.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -122,13 +155,13 @@ releases.</emphasis></para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Xfce desktop environment only.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 or 64 bit architectures.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -139,22 +172,10 @@ releases.</emphasis></para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>These are minimal ISO's containing no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient if
-bandwidth is too low to download a full DVD, or if you have a PC without a
-DVD drive or is unable to boot from a USB stick.</para>
-          </listitem>
-          <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>First steps are English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -162,8 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -171,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains non-free software (mostly drivers, codecs...) for people who need
-it.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -184,16 +204,23 @@ it.</para>
       <title>Downloading</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, you are provided with some information, such as
-the mirror in use and an option to switch if the bandwidth is too low. If
-http is chosen, you will also see something regarding checksums.</para>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the
-other, and copy the checksum <link linkend="integrity">for later
-use</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
@@ -201,52 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
 algorithm from the file to be downloaded. You may compare the checksum of
 your downloaded ISO against that of the original source ISO. If the
 checksums do not match, it means that the actual data on the ISO's do not
-match, and if it is the case, then you should retry the download or attempt
-a repair using BitTorrent.</para>
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>To generate the checksum for your downloaded ISO, open a console, (no need
 to be root), and:</para>
       <itemizedlist>
         <listitem>
-          <para>To use md5sum, type: <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>To use sha1sum, type: <userinput>sha1sum
-path/to/the/image/file.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Пример:</para>
+      <para>Пример:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Burn or dump the ISO</title>
-    <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
-stick. This is not a standard copy operation as a bootable medium will
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
 actually be created.</para>
     <section>
       <title>Burning the ISO to a CD/DVD</title>
-      <para>Whichever software you use, ensure that the option to burn an <emphasis
-role="bold">image</emphasis> is used, burn <emphasis
-role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not
-correct. See <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link> for more information.</para>
     </section>
     <section>
       <title>Dump the ISO to a USB stick</title>
-      <para>All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick
-and then use it to boot and install the system.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any existing data will be lost and the partition capacity will
-be reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>To recover the original capacity, you must redo partitioning and re-format
-the USB stick.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Using a graphical tool within Mageia</title>
         <para>You can use a graphical tool like <link
@@ -258,7 +296,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <itemizedlist>
           <listitem>
             <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -267,7 +305,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Using Command line within a GNU/Linux system</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk overwriting
 potentially valuable existing data if you specify the wrong target device.</para>
@@ -277,27 +315,27 @@ potentially valuable existing data if you specify the wrong target device.</para
             <para>Open a console</para>
           </listitem>
           <listitem>
-            <para>Become a root (Administrator) user with the command <userinput>su
--</userinput> (don't forget the final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Plug in your USB stick (do not mount it, this also means do not open any
-application or file manager that could access or read it)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Enter the command <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
             <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
             <para>Alternatively, you can find the device name with the command
-<code>dmesg</code>: towards the end of this example, you can see the device
-name starting with <emphasis>sd</emphasis>, and in this case,
-<emphasis>sdd</emphasis> is the actual device. You can also see that its
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
 size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
@@ -319,21 +357,22 @@ size is 2GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: <emphasis role="bold"># <userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Where X=your device name eg: /dev/sdd</para>
-            <para>Example:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-and <emphasis role="bold">of</emphasis> stands for <emphasis
-role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Enter the command: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>This is the end of the process, and you may now unplug your USB stick.</para>
@@ -342,4 +381,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/acceptLicense.xml b/docs/docs/stable/installer/bg/acceptLicense.xml
index ef9b5bee..4827c486 100644
--- a/docs/docs/stable/installer/bg/acceptLicense.xml
+++ b/docs/docs/stable/installer/bg/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">License and Release Notes</title>
   </info>
 
@@ -46,18 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">License Agreement</title>
     </info>
 
-    <para>Before installing <application>Mageia</application>, please read the license
-terms and conditions carefully.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>These terms and conditions apply to the entire
-<application>Mageia</application> distribution and must be accepted before
-you can continue.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>To proceed, simply select <guilabel>Accept</guilabel> and then click on
-<guibutton>Next</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>If you decide not to accept these conditions, then we thank you for
-looking. Clicking <guibutton>Quit</guibutton> will reboot your computer.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -75,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Important information about this release of
-<application>Mageia</application> can be viewed by clicking on the
-<guibutton>Release Notes</guibutton> button.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/addUser.xml b/docs/docs/stable/installer/bg/addUser.xml
index d1548d2b..38124cd4 100644
--- a/docs/docs/stable/installer/bg/addUser.xml
+++ b/docs/docs/stable/installer/bg/addUser.xml
@@ -1,32 +1,51 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="bg" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">User and Superuser Management</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Set Administrator (root)  Password:</title>
     </info>
 
-    <para>It is advisable for all <application>Mageia</application> installations to
-set a <emphasis role="bold">superuser</emphasis> (administrator) password,
-usually called the <emphasis>root password</emphasis> in Linux. As you type
-a password into the top box a shield will change from red to yellow to green
-depending on the strength of the password. A green shield shows you are
-using a strong password. You need to repeat the same password in the box
-underneath, to check that the first entry was not mistyped.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>All passwords are case sensitive. It is best to use a mixture of letters
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
 (upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
@@ -36,43 +55,46 @@ underneath, to check that the first entry was not mistyped.</para>
       <title xml:id="enterUser-ti3">Въведете потребител</title>
     </info>
 
-    <para>Add a user here. A regular user has fewer privileges than the <emphasis
-role="bold">superuser</emphasis> (root), but enough to use the internet,
-office applications or play games and anything else the average user might
-use their computer for.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Icon</guibutton>: if you click on this button it will change the
-user's icon.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Real Name</guilabel>: Insert the user's real name into this text
-box.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use
-a version of the user's real name. <emphasis role="bold">The login name is
-case sensitive.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password</guilabel>: Type in the user password. There is a shield
-at the end of the text box that indicates the strength of the password. (See
-also <xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password (again)</guilabel>: Retype the user password DrakX will
-check that you have not mistyped the password.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Any users you added while installing Mageia, will have a home directory that
-is both read and write protected (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
@@ -82,32 +104,31 @@ management</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Advanced User Management</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>The <guibutton>Advanced</guibutton> option allows you to edit further
-settings for the user you are adding.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
-<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis>
-and <emphasis role="bold">Sh</emphasis></para>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the <emphasis
-role="bold">user ID</emphasis> for any user you added in the previous
-screen. If you are unsure what the purpose of this is, then leave it blank.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/bg/add_supplemental_media.xml b/docs/docs/stable/installer/bg/add_supplemental_media.xml
index cbc607ce..051b35e7 100644
--- a/docs/docs/stable/installer/bg/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/bg/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="bg">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Media Selection (Configure Supplemental Installation Media)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,43 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>This screen shows you the list of already recognized repositories. You can
-add other sources for packages, like an optical disc or a remote source.
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
 The source selection determines which packages will be available during the
-next steps.</para>
+subsequent steps.</para>
 
   <para>For a network source, there are two steps to follow:</para>
 
   <orderedlist>
     <listitem>
-      <para>Choosing and activation of the network, if not already up.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
       <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
 mirror, you have access to the selection of all repositories managed by
-Mageia, like the <emphasis role="bold">Nonfree</emphasis>, the <emphasis
-role="bold">Tainted</emphasis> repositories and the <emphasis
-role="bold">Updates</emphasis>. With the URL, you can designate a specific
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
 repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>If you are updating a 64 bit installation which may contain some 32 bit
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
 packages, it is advised to use this screen to add an online mirror by
-ticking one of the Network protocols here. The 64-bit DVD ISO only contains
-64-bit and noarch packages, it will not be able to update the 32-bit
-packages. However, after adding an online mirror, the installer will find
-the needed 32-bit packages there.</para>
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/ask_mntpoint_s.xml b/docs/docs/stable/installer/bg/ask_mntpoint_s.xml
index b6461780..aa35da97 100644
--- a/docs/docs/stable/installer/bg/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/bg/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="bg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Изберете точките за монтиране</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
 
   <para>Here you see the Linux partitions that have been found on your computer. If
-you don't agree with the <application>DrakX</application> suggestions, you
-can change the mount points.</para>
-
-  <note>
-    <para>If you change anything, make sure you still have a <emphasis
-role="bold"><literal>/</literal></emphasis> (root) partition.</para>
-  </note>
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis
-role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
-name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis>
-(for example, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>If you have several partitions, you can choose various different mount
-points from the drop down menu, such as <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis
-role="bold">/var</emphasis>. You can even make your own mount points, for
-instance <emphasis role="bold"><literal>/video</literal></emphasis> for a
-partition where you want to store your films, or <emphasis
-role="bold">/Data</emphasis> (or some other name) for your data.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -79,13 +82,17 @@ mount point field blank.</para>
   </itemizedlist>
 
   <warning>
-    <para>If you are not sure what to choose, click <emphasis
-role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
-disk partitioning</guilabel>, where, you can click on a partition to see its
-type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
   <para>If you are sure the mount points are correct, click on
-<guibutton>Next</guibutton>, and choose whether you only want to format the
-partition(s) DrakX suggests, or more.</para>
-</section>
\ No newline at end of file
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/bg/bestTime.xml b/docs/docs/stable/installer/bg/bestTime.xml
index 33bab44c..038774b0 100644
--- a/docs/docs/stable/installer/bg/bestTime.xml
+++ b/docs/docs/stable/installer/bg/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="bg" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="bg" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Clock settings</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>In this step, you have to select on which time your internal clock is set,
-either local time or UTC time.</para>
-
-  <para>In advanced tab, you will find more options about clock settings.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/bootLive.xml b/docs/docs/stable/installer/bg/bootLive.xml
index 4fc7ecf0..6d968203 100644
--- a/docs/docs/stable/installer/bg/bootLive.xml
+++ b/docs/docs/stable/installer/bg/bootLive.xml
@@ -1,29 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="bg"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
-DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
-bootloader to launch the installation automatically after rebooting the
-computer. If that does not happen you may need to reconfigure your BIOS or
-press one key that will offer you to choose the peripheral from which the
-computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
-ISO. According to your BIOS settings, the computer boots perhaps directly on
-the USB device already plugged in a port. If that does not happen you may
-need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject> <imagedata fileref="../live-bootCSM.png"/> </imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
-or USB stick) without writing anything on the disk, so expect a very slow
-system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
-when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
-the inserted installation medium. Here, select other sources, like FTP or
-NFS servers. If the installation is carried out in a network with an SLP
-server, select one of the installation sources available on the server with
-this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
-optional disk with a driver update and will require its insertion during
-installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject> <imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/> </imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice)  or to
-process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
-duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para><para>In each case, the first steps will be the same to choose language, timezone
-and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Booting the medium</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>First screen while booting in BIOS mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">In UEFI mode</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/bg/chooseDesktop.xml b/docs/docs/stable/installer/bg/chooseDesktop.xml
index b30a5152..9a17301b 100644
--- a/docs/docs/stable/installer/bg/chooseDesktop.xml
+++ b/docs/docs/stable/installer/bg/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="bg" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Desktop Selection</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Desktop Selection</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide-show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> or <application>GNOME</application>
-desktop environment. Both come with a full set of useful applications and
-tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
-use both), or if you want to modify the default software choices for these
-desktop environments. The <application>LXDE</application> desktop, for
-instance, is lighter than the previous two, sporting less eye candy and
-fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/bg/choosePackageGroups.xml b/docs/docs/stable/installer/bg/choosePackageGroups.xml
index 1bf26e8f..36db1820 100644
--- a/docs/docs/stable/installer/bg/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/bg/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="bg" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="bg" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Избор на група от пакети</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/bg/choosePackagesTree.xml b/docs/docs/stable/installer/bg/choosePackagesTree.xml
index 90e73fc4..8d04b0f0 100644
--- a/docs/docs/stable/installer/bg/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/bg/choosePackagesTree.xml
@@ -1,21 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="bg">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="bg">
   <info>
     <title xml:id="choosePackagesTree-ti1">Choose Individual Packages</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-  <para>After having made your choice, you can click on the <guibutton>floppy
-icon</guibutton> at the bottom of the page to save your choice of packages
-(saving to a USB key works, too). You can then use this file to install the
-same packages on another system, by pressing the same button during install
-and choosing to load it.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/configureServices.xml b/docs/docs/stable/installer/bg/configureServices.xml
index f7634574..905cf455 100644
--- a/docs/docs/stable/installer/bg/configureServices.xml
+++ b/docs/docs/stable/installer/bg/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="bg" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="bg" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Configure your Services</title>
   </info>
@@ -7,20 +7,31 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose are usually good.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">If you highlight a service, some information about it is shown in the info
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">If you highlight a service, some information about it is shown in the info
 box below.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Only change things when you know very well what you are doing.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/configureTimezoneUTC.xml b/docs/docs/stable/installer/bg/configureTimezoneUTC.xml
index dae7b6dd..8ea517be 100644
--- a/docs/docs/stable/installer/bg/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/bg/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="bg">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="bg">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Configure your Timezone</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the
-same time-zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
 or to GMT, also known as UTC.</para>
diff --git a/docs/docs/stable/installer/bg/configureX_card_list.xml b/docs/docs/stable/installer/bg/configureX_card_list.xml
index 462c3772..0de1accc 100644
--- a/docs/docs/stable/installer/bg/configureX_card_list.xml
+++ b/docs/docs/stable/installer/bg/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="bg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX has a very comprehensive database of video cards and will usually
 correctly identify your video device.</para>
@@ -29,33 +42,34 @@ correctly identify your video device.</para>
   <para>If the installer has not correctly detected your graphic card and you know
 which one you have, you can select it from the tree by: <itemizedlist>
       <listitem>
-        <para>vendor</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>then the name of your card</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>and the type of card</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-<emphasis role="bold">Xorg</emphasis> category, which provides more than 40
-generic and open source video card drivers. If you still can't find a
-specific driver for your card there is the option of using the <emphasis
-role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the <emphasis role="bold">Command-line</emphasis> Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the <emphasis role="bold">Nonfree</emphasis>
-repository and in some cases only from the card manufacturers' websites.</para>
-
-  <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be
-explicitly enabled to access them. If you didn't enable it previously, you
-should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/bg/configureX_chooser.xml b/docs/docs/stable/installer/bg/configureX_chooser.xml
index 2c883044..5279e24a 100644
--- a/docs/docs/stable/installer/bg/configureX_chooser.xml
+++ b/docs/docs/stable/installer/bg/configureX_chooser.xml
@@ -1,62 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="bg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Graphic Card and Monitor Configuration</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym> or any other graphical environment to work well, the
-following <acronym>X</acronym> settings need to be correct. Choose the
-correct settings if none are shown, or if you think the details are
-incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card
-from the list if needed.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from
-the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose
-<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and
-vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Incorrect refresh rates may damage your monitor</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and
-color depth of your monitor can be set here.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the option is there, and you test your
-settings, you should be ask whether your settings are correct. If you answer
-<emphasis role="bold">yes</emphasis>, the settings will be kept. If you
-don't see anything, you'll return to the configuration screen and be able to
-reconfigure everything until the test result is satisfactory. If the test
-option is not available, then make sure your settings are on the safe side.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to
-enable or disable various options.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/bg/configureX_monitor.xml b/docs/docs/stable/installer/bg/configureX_monitor.xml
index 98b8398e..31d5747f 100644
--- a/docs/docs/stable/installer/bg/configureX_monitor.xml
+++ b/docs/docs/stable/installer/bg/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="bg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,64 +23,82 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX has a very comprehensive database of monitors and will usually
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX has a very comprehensive database of monitors and will usually
 correctly identify yours.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
 could damage your monitor or video hardware. Please don't try something
 without knowing what you are doing.</emphasis> If in doubt you should
 consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Custom</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters, the vertical refresh
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
 rate and the horizontal sync rate. Vertical refresh determines how often the
 screen is refreshed and horizontal sync is the rate at which scan lines are
 displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
+        <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
 type with a sync range that is beyond the capabilities of your monitor: you
 may damage your monitor. If in doubt, choose a conservative setting and
 consult your monitor documentation.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">This is the default option and tries to determine the monitor type from the
-monitor database.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Vendor</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">If the installer has not correctly detected your monitor and you know which
-one you have, you can select it from the tree by selecting: <itemizedlist>
       <listitem>
-        <para>vendor</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>the monitor manufacturers name</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>the monitor description</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can select it from the tree by selecting:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Generic</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the <emphasis
-role="bold">Vesa</emphasis> card driver when your video hardware cannot be
-determined automatically. Once again it may be wise to be conservative in
-your selections.</para>
-</section>
\ No newline at end of file
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/bg/diskPartitioning.xml b/docs/docs/stable/installer/bg/diskPartitioning.xml
new file mode 100644
index 00000000..ac4e29b5
--- /dev/null
+++ b/docs/docs/stable/installer/bg/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="bg" version="5.0" xml:lang="bg">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/diskdrake.xml b/docs/docs/stable/installer/bg/diskdrake.xml
index 860b34f6..19eb5f05 100644
--- a/docs/docs/stable/installer/bg/diskdrake.xml
+++ b/docs/docs/stable/installer/bg/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="bg" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Custom disk partitioning with DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis>
-partition you must ensure that you have a separate <emphasis
-role="bold">/boot</emphasis> partition. The encryption option for the
-<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise
-your system will be unbootable.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view their details before you start.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage
-device like a USB key). In the screen-shot above there are two available
-devices: <emphasis role="bold">sda </emphasis>and <emphasis
-role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if
-you are sure you want to wipe all partitions on the selected storage device.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Expert mode</guibutton> provides more options such as a label
-(give a name to) a partition, or to choose a partition type.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Click <guibutton>Done</guibutton> when you're ready.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
-Partition) is present and correctly mounted on /boot/EFI (see below)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/bg/doPartitionDisks.xml b/docs/docs/stable/installer/bg/doPartitionDisks.xml
index 7ac4da27..b2caf84a 100644
--- a/docs/docs/stable/installer/bg/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/bg/doPartitionDisks.xml
@@ -1,172 +1,214 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="bg" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Управление на дискови дялове</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the
-DrakX partitioning proposals for where to install
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the
-layout and content of your particular hard drive(s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Use Existing Partitions</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">If this option is available, then existing Linux compatible partitions have
+      <para revision="1" xml:id="doPartitionDisks-pa5">If this option is available, then existing Linux compatible partitions have
 been found and may be used for the installation.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Use Free Space</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">If you have unused space on your hard drive then this option will use it for
+      <para revision="1" xml:id="doPartitionDisks-pa7">If you have unused space on your hard drive then this option will use it for
 your new Mageia installation.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Use Free Space on a Windows Partition</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">If you have unused space on an existing Windows partition, the installer may
-offer to use it.</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">This can be a useful way of making room for your new Mageia installation,
-but is a risky operation so you should make sure you have backed up all
-important files!</para>
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
 partition must be "clean", meaning that Windows must have closed down
 correctly the last time it was used. It must also have been defragmented,
 although this is not a guarantee that all files in the partition have been
 moved out of the area that is about to be used. It is highly recommended to
 back up your personal files.</para>
+      </important>
+    </listitem>
 
-        <para>With this option, the installer displays the remaining Windows partition in
-light blue and the proposed Mageia partition in dark blue with their
-intended sizes just underneath. You have the option to modify these sizes by
-clicking and dragging the gap between both partitions. See the following
-screen-shot.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Erase and use Entire Disk.</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">This option will allocate the entire drive for Mageia.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Note! This will erase ALL data on the selected hard drive. Take care!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">This gives you complete control over the placing of the installation on your
+hard drive(s).</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">If you intend to use part of the disk for something else, or you already
-have data on the drive that you are not prepared to lose, then do not use
-this option.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Персонализирано разделяне на диска</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">This gives you complete control over the placing of the installation on your
-hard drive(s).</para>
-      </listitem>
-    </itemizedlist></para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para>If you are not using the <emphasis role="bold">Custom disk
-partitioning</emphasis> option, the installer will allocate the available
-space according to the following rules:</para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>If the total available space is less than 50 GB, then only one partition is
-created. This will be the <emphasis role="bold">/</emphasis> (root)
-partition.</para>
-      </listitem>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-      <listitem>
-        <para>If the total available space is greater than 50 GB, then three partitions
-are created</para>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 of the total available place is allocated to <emphasis
-role="bold">/</emphasis> with a maximum of 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 is allocated to swap with a maximum of 4 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>the rest (at least 12/19) is allocated to <emphasis
-role="bold">/home.</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-  <para>That means that from 160 GB or greater available space, the installer will
-create three partitions: 50 GB for <emphasis role="bold">/</emphasis>, 4 GB
-for <emphasis role="bold">swap</emphasis> and the remainder for <emphasis
-role="bold">/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
-automatically detected - or created if it does not exist yet, and mounted on
-/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to
-create a BIOS boot partition if not already existing. It is a roughly 1 MiB
-partition with no mount point. Choose <xref linkend="diskdrake"/> to be able
-to create it with the Installer like any other partition, just select BIOS
-boot partition as the filesystem type.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512. Due to lack of available hardware, the
 partitioning tool used in the installer has not been tested with such a
-drive. Also some SSD devices now use an erase block size over 1 MB. If you
-have such a device we suggest that you partition the drive in advance, using
-an alternative partitioning tool like <emphasis
-role="bold">gparted</emphasis>, and to use the following settings:</para>
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/bg/exitInstall.xml b/docs/docs/stable/installer/bg/exitInstall.xml
index b3943e3c..7920efd1 100644
--- a/docs/docs/stable/installer/bg/exitInstall.xml
+++ b/docs/docs/stable/installer/bg/exitInstall.xml
@@ -5,23 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring
-<application>Mageia</application> and it is now safe to remove the
-installation medium and reboot your computer.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems (if there are more than one) on your computer.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the settings for the bootloader, your Mageia install
 will be automatically selected and started.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Забавлявайте се!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Visit www.mageia.org if you have any questions or want to contribute to
-Mageia</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/firewall.xml b/docs/docs/stable/installer/bg/firewall.xml
index 43c94ebd..321e8298 100644
--- a/docs/docs/stable/installer/bg/firewall.xml
+++ b/docs/docs/stable/installer/bg/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="bg">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="bg" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Защитна стена</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Защитна стена</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
   <para>In the default setting (no button is checked), no service of the system is
-accessible from the network. The <emphasis role="bold">Everything (no
-firewall)</emphasis> enables access to all services of the machine - an
-option that does not make much sense in the context of the installer since
-it would create a totally unprotected system. Its veritable use is in the
-context of the Mageia Control Center (which uses the same GUI layout) for
-temporarily disabling the entire set of firewall rules for testing and
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
 debugging purposes.</para>
 
   <para>All other options are more or less self-explanatory. As an example, you will
-enable the <emphasis role="bold">CUPS server</emphasis> if you want printers
-on your machine to be accessible from the network.</para>
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where
-you can enable a series of services by typing a list of couples (blank
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
diff --git a/docs/docs/stable/installer/bg/formatPartitions.xml b/docs/docs/stable/installer/bg/formatPartitions.xml
index dd114f95..c9530b0e 100644
--- a/docs/docs/stable/installer/bg/formatPartitions.xml
+++ b/docs/docs/stable/installer/bg/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="bg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Форматиране</title>
   </info>
@@ -11,32 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
 partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Usually at least the partitions DrakX selected, need to be formatted</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Click on <guibutton>Advanced</guibutton> to choose partitions you want to
-check for so called <emphasis>bad blocks</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen,
-where you can choose to view details of your partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">When you are confident about the selection, click on
-<guibutton>Next</guibutton> to continue.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/bg/graphicalConfiguration.xml b/docs/docs/stable/installer/bg/graphicalConfiguration.xml
new file mode 100644
index 00000000..9182b762
--- /dev/null
+++ b/docs/docs/stable/installer/bg/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/bg/installUpdates.xml b/docs/docs/stable/installer/bg/installUpdates.xml
index ead7f0a3..d97faf9d 100644
--- a/docs/docs/stable/installer/bg/installUpdates.xml
+++ b/docs/docs/stable/installer/bg/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="bg">
-  <info>
-    <title xml:id="installUpdates-ti1">Обновявания</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Обновявания</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of <application>Mageia</application> was released, some
-packages will have been updated or improved.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them,
-select <guilabel>No</guilabel> if you don't want to do this now, or if you
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
 aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Press <guibutton>Next</guibutton> to continue</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/installer.xml b/docs/docs/stable/installer/bg/installer.xml
index 032ae3d2..17f127ab 100644
--- a/docs/docs/stable/installer/bg/installer.xml
+++ b/docs/docs/stable/installer/bg/installer.xml
@@ -6,165 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, инсталатора на Mageia</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, инсталатора на Mageia</title>
   </info>
 
   <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
 Installer is designed to help make your installation or upgrade as easy as
 possible.</para>
 
-  <para>The initial menu screen has various options, however the default one will
-start the installer, which will normally be all that you will need.</para>
+  <section>
+    <title>The installation steps</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Installation Welcome Screen</title>
 
-    <section>
-      <title>Using a Mageia DVD</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>From this screen, you have access to options by pressing "<emphasis
-role="bold">e</emphasis>" to enter the edit mode. To come back to this
-screen, press either <emphasis role="bold">Esc</emphasis> key to quit
-without saving or press the key <emphasis role="bold">Ctrl</emphasis> or
-<emphasis role="bold">F10</emphasis> to quit with saving.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, it is possible to set some preferences (note that the
-options <emphasis role="bold">F1</emphasis> to <emphasis
-role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist>
-          <listitem>
-            <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis
-role="bold">F6</emphasis> options, you can view relevant help by pressing
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a
-specific language for the installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>If needed, change the screen resolution by pressing <emphasis
-role="bold">F3</emphasis> (Legacy mode only).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis role="bold">F6</emphasis> <emphasis
-role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis
-role="bold">e</emphasis> instead).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Default: It doesn't alter anything in the default options.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: Priority is given to the safer options at the price of a
-performance detriment.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI: (Advanced Configuration and Power Interface): Power management
-features are not used.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU
-interrupt. Select this option if you experience system misbehaviour like a
-kernel panic in relation to APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>When you select one of these entries, it modifies the default options
-displayed in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with
-<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot
-Options</guilabel> line, despite this, they will in fact be applied.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various
-boot options. Select an item with the arrow keys and press <emphasis
-role="bold">Enter</emphasis> for more details or press <emphasis
-role="bold">Esc</emphasis> to go back to the welcome screen.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>The detailed view about the splash option. Press <emphasis
-role="bold">Esc</emphasis> or select <guilabel>Return to Boot
-Options</guilabel> to go back to the options list. These options can be
-added by hand in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>For more information about kernel options on legacy and UEFI systems, see:
-<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>The installation steps</title>
+    <section>
+      <title>UEFI Systems</title>
 
-    <para>The install process is divided into a number of steps, the status of which
-is indicated in a panel to the left of the screen.</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
-options.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
-about the particular step.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
-is possible to reboot, but please think twice before you do this. Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -175,19 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>After the initial screen you did not reach the language selection
-screen. This can happen with some graphic cards and older systems. Try using
-low resolution by typing <code>vgalo</code> at the prompt.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this press <emphasis role="bold">Esc</emphasis> at the first welcome screen
-and confirm with <emphasis role="bold">ENTER</emphasis>. You will be
-presented with a black screen with the word "boot:". Type "text" and press
-<emphasis role="bold">ENTER</emphasis> to continue with the installation in
-text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -196,10 +196,10 @@ text mode.</para>
       <title>The Install Freezes</title>
 
       <para>If the system appeared to freeze during the installation, this may be a
-problem with hardware detection. In this case the automatic detection of
-hardware may be bypassed and dealt with later. To try this, type
-<code>noauto</code> at the prompt. This option may also be combined with
-other options as necessary.</para>
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -207,17 +207,18 @@ other options as necessary.</para>
 
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dynamic partitions</title>
 
-      <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis>
-format to <emphasis role="bold">dynamic</emphasis> format in Microsoft
-Windows, then it is not possible to install Mageia on this disc. To revert
-to a basic disk, see the Microsoft documentation: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/bg/locale.xml b/docs/docs/stable/installer/bg/locale.xml
new file mode 100644
index 00000000..2b53e7a1
--- /dev/null
+++ b/docs/docs/stable/installer/bg/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/bg/login.xml b/docs/docs/stable/installer/bg/login.xml
index 28063302..86932394 100644
--- a/docs/docs/stable/installer/bg/login.xml
+++ b/docs/docs/stable/installer/bg/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="bg"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject> <imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/> </imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
-yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para><para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="bg">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/media_selection.xml b/docs/docs/stable/installer/bg/media_selection.xml
index e418dcb1..adb5cae3 100644
--- a/docs/docs/stable/installer/bg/media_selection.xml
+++ b/docs/docs/stable/installer/bg/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="bg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Media Selection (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Here you have the list of available repositories. Not all repositories are
 available, according to which media you use for installing. The repositories
@@ -35,7 +44,7 @@ the base of the distribution.</para>
       <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
 free-of-charge, i.e. Mageia may redistribute them, but they contain
 closed-source software (hence the name - Nonfree). For example this
-repository includes nVidia and ATI graphics card proprietary drivers,
+repository includes nVidia and AMD graphics card proprietary drivers,
 firmware for various WiFi cards, etc.</para>
     </listitem>
 
diff --git a/docs/docs/stable/installer/bg/minimal-install.xml b/docs/docs/stable/installer/bg/minimal-install.xml
index 059087e9..8b172968 100644
--- a/docs/docs/stable/installer/bg/minimal-install.xml
+++ b/docs/docs/stable/installer/bg/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="bg">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="bg">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Minimal Install</title>
   </info>
@@ -10,26 +13,40 @@
 
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
-  <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+  
 
-  <para>Minimal Installation is intended for those with specific uses in mind for
-<application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the <emphasis
-role="bold">Individual package selection</emphasis> option mentioned above,
-to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>If you choose this installation method, then the relevant screen will offer
-you a few useful extras to install, such as documentation and X.</para>
+  
 
-  <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
 lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para>The basic documentation is provided in the form of man and info pages.  It
-contains the man pages from the <link
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
 Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
diff --git a/docs/docs/stable/installer/bg/misc-params.xml b/docs/docs/stable/installer/bg/misc-params.xml
index e1557884..863da561 100644
--- a/docs/docs/stable/installer/bg/misc-params.xml
+++ b/docs/docs/stable/installer/bg/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="bg" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Summary of miscellaneous parameters</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
 
   <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
 the choices you made and on the hardware detected. You can check the
 settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>As a general rule, it is recommended that you accept the default settings
@@ -26,7 +42,7 @@ unless:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>some other factor mentionned in the detailed sections below is an issue.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,46 +54,47 @@ unless:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Timezone</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
 can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Country / Region</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
 setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Bootloader</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX has made good choices for the bootloader setting.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">For more information, see <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>User management</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each get their own
-<literal>/home</literal> directories.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Services</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
 (daemons).  This tool allows you to enable or disable certain processes.</para>
 
         <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
-prevent your computer from operating correctly.</para>
-
-        <para>For more information, see <xref linkend="configureServices"/></para>
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -89,7 +106,7 @@ prevent your computer from operating correctly.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Keyboard</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
 of keyboard.</para>
@@ -101,27 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Mouse</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add or configure other pointing devices, tablets, trackballs
 etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Sound card</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The
-option to select a different driver is only given when there is more than
-one driver for your card, but where none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Graphical interface</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphic card(s) and displays.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">For more information, see <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -136,11 +158,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Network</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, using the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
@@ -150,14 +172,14 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxies</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
         <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
-internet.  This section allows you to configure your computer to utilize a
+Internet.  This section allows you to configure your computer to utilize a
 proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -169,26 +191,31 @@ need to enter here.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Ниво на сигурност</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Here you set the Security level for your computer, in most cases the default
-setting (Standard) is adequate for general use.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Check the option which best suits your usage.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Защитна стена</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">A firewall is intended to be a barrier between your important data and the
-rascals out there on the internet who would compromise or steal it.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing everything (no firewall) may be very risky.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/bg/reboot.xml b/docs/docs/stable/installer/bg/reboot.xml
index 3ead6573..3b6f5a12 100644
--- a/docs/docs/stable/installer/bg/reboot.xml
+++ b/docs/docs/stable/installer/bg/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="bg" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Рестартиране</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/bg/securityLevel.xml b/docs/docs/stable/installer/bg/securityLevel.xml
index c5a13769..3e173f9a 100644
--- a/docs/docs/stable/installer/bg/securityLevel.xml
+++ b/docs/docs/stable/installer/bg/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="bg" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Ниво на сигурност</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended
-setting for the average user. The <emphasis role="bold">Secure</emphasis>
-setting will create a highly protected system - for instance if the system
-is to be used as a public server.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Security Administrator</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
 which require notification to a system administrator.</para>
 
-  <para>A good, and easy-to-implement, choice is to enter &lt;user>@localhost -
-where &lt;user> is the login name of the user to receive these messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
 be configured for receiving such mail!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/bg/selectCountry.xml b/docs/docs/stable/installer/bg/selectCountry.xml
index 412be129..fbbbca3a 100644
--- a/docs/docs/stable/installer/bg/selectCountry.xml
+++ b/docs/docs/stable/installer/bg/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="bg">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="bg">
   <info>
     <title xml:id="selectCountry-ti1">Select your Country / Region</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> option and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem that a country from the
-first list was chosen. Please ignore this, as DrakX will apply your actual
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,7 +40,7 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Input method</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
@@ -39,9 +50,9 @@ selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via <emphasis role="bold">Configure
-your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
-running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/selectInstallClass.xml b/docs/docs/stable/installer/bg/selectInstallClass.xml
index eba59c8c..c8d94a10 100644
--- a/docs/docs/stable/installer/bg/selectInstallClass.xml
+++ b/docs/docs/stable/installer/bg/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="bg" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Install or Upgrade</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Инсталирай</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option to perform a fresh installation of
-<application>Mageia</application>. This will format the root partition (/),
-but can preserve a separated /home partition.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Подобри</para>
-
-      <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that has reached
-its End Of Life, then it is better to do a clean install instead while
-preserving your <literal>/home</literal> partition.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that, and only if you are very sure
-rebooting is what you want, go to a text terminal by pressing <guilabel>Alt
-Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the <emphasis role="bold">Install or Upgrade</emphasis>
-screen to the language choice screen by pressing <guilabel>Alt Ctrl
-Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do
-this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/bg/selectKeyboard.xml b/docs/docs/stable/installer/bg/selectKeyboard.xml
index 38bd6dc6..80141c7a 100644
--- a/docs/docs/stable/installer/bg/selectKeyboard.xml
+++ b/docs/docs/stable/installer/bg/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="bg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,19 +19,22 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Клавиатура</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX selects an appropriate keyboard for your language. If no suitable
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX selects an appropriate keyboard for your language. If no suitable
 keyboard is found it will default to a US keyboard layout.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Make sure that the selection is correct or choose another keyboard
+      <para revision="1" xml:id="selectKeyboard-pa2">Make sure that the selection is correct or choose another keyboard
 layout. If you don't know which layout your keyboard has, look in the
 specifications that came with your system, or ask the computer vendor. There
 may even be a label on the keyboard that identifies the layout. You can also
@@ -27,23 +43,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a fuller list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this and
-continue the installation: the keyboard chosen from the full list will be
-applied.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
 extra dialogue screen asking how you would prefer to switch between the
 Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/bg/selectKeyboardLive.xml b/docs/docs/stable/installer/bg/selectKeyboardLive.xml
index 30caa5b5..8e615e48 100644
--- a/docs/docs/stable/installer/bg/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/bg/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="bg" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Изберете клавиатура</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>You will be required to set the keyboard layout you wish to use in
-Mageia​​. The default one is selected according to your language and
-timezone previously selected.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/bg/selectLanguage.xml b/docs/docs/stable/installer/bg/selectLanguage.xml
index 6dcac3fa..f99a2112 100644
--- a/docs/docs/stable/installer/bg/selectLanguage.xml
+++ b/docs/docs/stable/installer/bg/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="bg" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,50 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Моля, изберете език</title>
   </info>
 
-  <para condition="classical">Select your preferred language, by first expanding the list for your
-continent. <application>Mageia</application> will use this selection during
-the installation and for your installed system.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">If it is likely that you (or others) will require several languages to be
-installed on your system, then you should use the <guibutton>Multiple
-languages</guibutton> option to add them now. It will be difficult to add
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
 extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
+  <important condition="classical">
     <para>Even if you choose more than one language, you must first choose one as your
-preferred language in the first language screen. It will also be marked as
-chosen in the multiple languages screen.</para>
-  </warning>
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
       <para>If your keyboard language is not the same as your preferred language, then
-it is advisable to install the language of your keyboard as well.</para>
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia uses UTF-8 (Unicode) support by default.</para>
-
-      <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple
-languages</emphasis> screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>You can change the language of your system after installation in the Mageia
-Control Center -> System -> Manage localization for your system.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/bg/selectMouse.xml b/docs/docs/stable/installer/bg/selectMouse.xml
index 24eb4af8..8a905b56 100644
--- a/docs/docs/stable/installer/bg/selectMouse.xml
+++ b/docs/docs/stable/installer/bg/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="bg">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Изберете мишка</title>
   </info>
@@ -7,25 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">If you are not happy with how your mouse responds, you can select a
 different one here.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB
-mice</guilabel> is a good choice.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to
-configure the buttons that do not work on a mouse with six or more buttons.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/bg/setupBootloader.xml b/docs/docs/stable/installer/bg/setupBootloader.xml
index cd147891..adb00f9a 100644
--- a/docs/docs/stable/installer/bg/setupBootloader.xml
+++ b/docs/docs/stable/installer/bg/setupBootloader.xml
@@ -1,146 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="bg" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="bg" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Опции на програмата за начално зареждане</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Bootloader interface</title>
-    <para>By default, Mageia uses exclusively:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot
-choose between the <emphasis role="bold">with</emphasis> or <emphasis
-role="bold">without graphical menu</emphasis> options.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to house the bootloader
-(GRUB2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds GRUB2-efi. Although it is possible to have
-several ESPs, only one is required (and advised), whatever the number of
-operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Using a Mageia bootloader</title>
-    <para>By default, and according to your system, Mageia writes one of the
-following:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then untick the <emphasis
-role="bold">Probe Foreign OS</emphasis> option.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
   <section>
-    <title>Using an existing bootloader</title>
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this documentation, however in most cases it will
-involve running the relevant bootloader installation program which should
-detect and add it automatically. See the documentation for the operating
-system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Опции</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>Първа страница</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you
-set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be required when booting
-to select a booting entry or change settings. The username is <emphasis
-role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will
-check that it matches with the one above.</para></listitem><listitem><para><guilabel>Advanced</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for power management. It can save energy by
-stopping unused devices.  Deselecting it could be useful if, for example,
-your computer does not support ACPI or if you think the ACPI implementation
-might cause some problems (for instance random reboots or system lockups).</para></listitem><listitem><para><guilabel>Enable SMP</guilabel>: This option enables/disables symmetric
-multiprocessing for multi core processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the operating system access to
-the Advanced Programmable Interrupt Controller. APIC devices permit more
-complex priority models, and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC manages all external
-interrupts for a specific processor in an SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Опции на програмата за начално зареждане</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Следваща страница</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-to be used by the boot menu. If you click the down triangle you will be
-offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Using an existing bootloader</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Add or Modify a Boot Menu Entry</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/setupSCSI.xml b/docs/docs/stable/installer/bg/setupSCSI.xml
index 0b9beaa2..8de29787 100644
--- a/docs/docs/stable/installer/bg/setupSCSI.xml
+++ b/docs/docs/stable/installer/bg/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="bg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Настройване на SCSI</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
 SCSI controllers it may be unable to determine the correct drivers to use
 and subsequently fail to recognise the drive.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s)
-you have.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">DrakX should then be able to configure the drive(s) correctly.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/bg/software.xml b/docs/docs/stable/installer/bg/software.xml
new file mode 100644
index 00000000..aba34f0d
--- /dev/null
+++ b/docs/docs/stable/installer/bg/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="bg" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/bg/soundConfig.xml b/docs/docs/stable/installer/bg/soundConfig.xml
index 65eea446..f138bfa1 100644
--- a/docs/docs/stable/installer/bg/soundConfig.xml
+++ b/docs/docs/stable/installer/bg/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="bg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Конфигуриране на звука</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if one exists.</para>
+  
 
-  <para>The default driver should work without problems. However, if after install
-you do encounter problems, then run <command>draksound</command> or start
-this tool via MCC (Mageia Control Center), by choosing the
-<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound
-Configuration</guilabel> at the top right of the screen.</para>
+  
 
-  <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis
-role="bold">Sound Configuration</emphasis> tool screen, click on
-<guibutton>Troubleshooting</guibutton> to find useful advice about how to
-solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Разширени настройки</title>
     </info>
 
-    <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in
-this screen, during install, is useful if there is no default driver and
-there are several drivers available, but you think the installer selected
-the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on <emphasis
-role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/bg/takeOverHdConfirm.xml b/docs/docs/stable/installer/bg/takeOverHdConfirm.xml
index 3e8abf0d..95f357e6 100644
--- a/docs/docs/stable/installer/bg/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/bg/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="bg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Confirm hard disk to be formatted</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is
-ok to erase every partition, every operating system and all data that might
-be on that hard disk.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/bg/testing.xml b/docs/docs/stable/installer/bg/testing.xml
index 5a9e9c26..581e3cdc 100644
--- a/docs/docs/stable/installer/bg/testing.xml
+++ b/docs/docs/stable/installer/bg/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testing Mageia as Live system</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Жив режим</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>You get this screen if you selected "Boot Mageia". If not, you get the
-"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Testing hardware</title>
       </info>
 
-      <para>One of the Live mode goals is to test if the hardware is correctly managed
-by Mageia. You can check if all devices have a driver in the Hardware
-section of the Mageia Control Center. You can test the most current devices:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>graphical card: if you see the previous screen, it's already OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webcam:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>printer: configure it and print a test page</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
       </itemizedlist>
 
-      <para>If all is OK for you, you can process to the installation. If not, you can
-leave with the quit button.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>The configuration settings you made here are kept for the installation.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,15 +68,14 @@ leave with the quit button.</para>
         <title xml:id="testing3-ti1">Launch installation</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
-SSD drive, simply click on the icon "Install on Hard Disk". You will get
-this screen, and then the "<link
-linkend="doPartitionDisks">Partitioning</link> step" as for the direct
-installation.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/bg/uninstall-Mageia.xml b/docs/docs/stable/installer/bg/uninstall-Mageia.xml
index 049cd7dd..c614dbd6 100644
--- a/docs/docs/stable/installer/bg/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/bg/uninstall-Mageia.xml
@@ -1,30 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="bg">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="bg" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
   </info>
 
   
 
+  
+
   <para>If Mageia didn't convince you or you can't install it correctly - in short
 you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-  <para>After your data backup, reboot your Mageia installation DVD and select
-<emphasis role="bold">Rescue system</emphasis>, then, <emphasis
-role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
-will only have Windows, with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>In Windows to recover the space used by Mageia partitions: click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code>. You will recognize a Mageia partition
-because they are labeled <guilabel>Unknown</guilabel>, and also by their
-size and place on the disk. Right click on each of these partitions and
-select <guibutton>Delete</guibutton> to free up the space.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
   <para>If you are using Windows XP, you can create a new partition and format it
-(FAT32 or NTFS). It will get a partition letter.</para>
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>If you have Vista or 7, you have one more possibility, you can extend the
 existing partition that is at the left of the freed space. There are other
@@ -32,4 +45,4 @@ partitioning tools that can be used, such as <emphasis
 role="bold">gparted</emphasis>, available for both Windows and Linux. As
 always, when changing partitions, be very careful to back up anything
 important to you.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/bg/unused.xml b/docs/docs/stable/installer/bg/unused.xml
index f1d8899e..77aabfbd 100644
--- a/docs/docs/stable/installer/bg/unused.xml
+++ b/docs/docs/stable/installer/bg/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="bg" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="bg">
   <info>
     <title xml:id="unused-ti1">Keep or delete unused material</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para>In this step, the installer looks for unused locales packages and unused
-hardware packages. Then it proposes you to delete them. It is a good idea to
-accept, except if you prepare an installation which has to run on different
-hardware.</para>
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
+
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>The next step is the copying of files on hard disk. This takes some
-minutes. At the end, you get a blank screen for some time, it's normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/ca/DrakLive-cover.xml b/docs/docs/stable/installer/ca/DrakLive-cover.xml
index 95cd281f..8a659ec4 100644
--- a/docs/docs/stable/installer/ca/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/ca/DrakLive-cover.xml
@@ -1,77 +1,105 @@
-<?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="ca" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="ca" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Instal·lació des d'un mitjà AUTÒNOM</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>January 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Instal·lació des d'un mitjà AUTÒNOM</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Documentació oficial de Mageia</para>
+      <para role="tagline">Documentació oficial de Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Els textos i les captures de pantalla d'aquest manual estan disponibles sota
+
+      <para>Els textos i les captures de pantalla d'aquest manual estan disponibles sota
 la llicència CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-            </para>
-            <para>Aquest manual ha estat creat amb l'ajuda de <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Aquest manual ha estat creat amb l'ajuda de <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> desenvolupat per <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-            </para>
-            <para>L'han escrit voluntaris durant el seu temps lliure. Si voleu ajudar a
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>L'han escrit voluntaris durant el seu temps lliure. Si voleu ajudar a
 millorar-lo, contacteu l'<link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">equip de
-documentació</link>.</para> 
+documentació</link>.</para>
     </cover>
   </info>
+
   <article>
     <title>Instal·lació des d'un mitjà AUTÒNOM</title>
-       <para><note>
-          <para>No tothom veurà totes les pantalles d'instal·lació que apareixen en aquest
+
+    <para><note>
+        <para>No tothom veurà totes les pantalles d'instal·lació que apareixen en aquest
 manual. Les imatges que veureu dependran del vostre maquinari i de les
 decisions que aneu prenent durant la instal·lació.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/ca/DrakLive.xml b/docs/docs/stable/installer/ca/DrakLive.xml
index cf38602a..9fd4fc16 100644
--- a/docs/docs/stable/installer/ca/DrakLive.xml
+++ b/docs/docs/stable/installer/ca/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="ca" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="ca" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Instal·lació des d'un mitjà AUTÒNOM</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Instal·lació des d'un mitjà AUTÒNOM</title>
 
     <cover>
       <para><note>
@@ -17,10 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> desenvolupat per <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>L'han escrit voluntaris durant el seu temps lliure. Si voleu ajudar a
-millorar-lo, contacteu l'<link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">equip de
-documentació</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>
 
@@ -40,7 +54,12 @@ documentació</link>.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -50,17 +69,18 @@ documentació</link>.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/ca/DrakX-cover.xml b/docs/docs/stable/installer/ca/DrakX-cover.xml
index 349c2faf..e620ef32 100644
--- a/docs/docs/stable/installer/ca/DrakX-cover.xml
+++ b/docs/docs/stable/installer/ca/DrakX-cover.xml
@@ -1,116 +1,155 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="ca" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="ca" xml:id="Quick-Startup"
+      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>Instal·lació amb DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Febrer del 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Febrer del 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Documentació oficial de Mageia</para>
+      <para role="tagline">Documentació oficial de Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>Els textos i les captures de pantalla d'aquest manual estan disponibles sota
+
+      <para>Els textos i les captures de pantalla d'aquest manual estan disponibles sota
 la llicència CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Aquest manual ha estat creat amb l'ajuda de <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Aquest manual ha estat creat amb l'ajuda de <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> desenvolupat per <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>L'han escrit voluntaris durant el seu temps lliure. Si voleu ajudar a
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>L'han escrit voluntaris durant el seu temps lliure. Si voleu ajudar a
 millorar-lo, contacteu l'<link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">equip de
-documentació</link>.</para> 
+documentació</link>.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Instal·lació amb DrakX</title>
-       <para><note>
-          <para>No tothom veurà totes les pantalles d'instal·lació que apareixen en aquest
+
+    <para><note>
+        <para>No tothom veurà totes les pantalles d'instal·lació que apareixen en aquest
 manual. Les imatges que veureu dependran del vostre maquinari i de les
 decisions que aneu prenent durant la instal·lació.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -118,29 +157,32 @@ decisions que aneu prenent durant la instal·lació.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/ca/DrakX-inline.xml b/docs/docs/stable/installer/ca/DrakX-inline.xml
new file mode 100644
index 00000000..27f7425c
--- /dev/null
+++ b/docs/docs/stable/installer/ca/DrakX-inline.xml
@@ -0,0 +1,139 @@
+<?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="ca" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Instal·lació amb DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>No tothom veurà totes les pantalles d'instal·lació que apareixen en aquest
+manual. Les imatges que veureu dependran del vostre maquinari i de les
+decisions que aneu prenent durant la instal·lació.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Els textos i les captures de pantalla d'aquest manual estan disponibles sota
+la llicència CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Aquest manual ha estat creat amb l'ajuda de <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> desenvolupat per <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>L'han escrit voluntaris durant el seu temps lliure. Si voleu ajudar a
+millorar-lo, contacteu l'<link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">equip de
+documentació</link>.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/DrakX.xml b/docs/docs/stable/installer/ca/DrakX.xml
index 20382cad..00ed6152 100644
--- a/docs/docs/stable/installer/ca/DrakX.xml
+++ b/docs/docs/stable/installer/ca/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="ca" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="ca" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Instal·lació amb DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Instal·lació amb DrakX</title>
 
     <cover>
       <para><note>
@@ -35,18 +73,6 @@ documentació</link>.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -61,23 +87,28 @@ documentació</link>.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -87,7 +118,10 @@ documentació</link>.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -95,19 +129,25 @@ documentació</link>.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -115,11 +155,15 @@ documentació</link>.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -138,4 +182,4 @@ documentació</link>.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/ca/SelectAndUseISOs2.xml b/docs/docs/stable/installer/ca/SelectAndUseISOs2.xml
index 527c2a33..c3a528d4 100644
--- a/docs/docs/stable/installer/ca/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/ca/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="ca" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Selecció i utilització de les ISO</title>
   </info>
   <section>
     <title>Introducció</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
-    <para>There are two families of media:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: Booting with this media provides you with the maximum
-flexibility when choosing what to install, and for configuring your
-system. In particular, you have a choice of which Desktop environment to
-install</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: This option allows you to try out Mageia without having to
-actually install it, or make any changes to your computer.  If the
-installation is decided, the process is simpler, but you get fewer choices
-than offered by the Classical installer</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Details are given in the next sections.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Mitjà</title>
     <section>
       <title>Definició</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support (DVD, USB
-stick, ...) the ISO file is copied to.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
@@ -43,25 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>Característiques comunes</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the Classical installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
             <para>They are used for performing clean installs or to upgrade a previously
-installed version of Mageia.</para>
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Some tools are available in the Welcome screen: Rescue System, Memory Test,
-Hardware Detection Tool.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Cada DVD conté diversos entorns d'escriptori disponible i diversos idiomes.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Durant la instal·lació se us oferirà la possibilitat d'afegir programari de
-propietat.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -73,21 +107,19 @@ propietat.</para>
         <itemizedlist>
           <listitem>
             <para>Can be used to preview the Mageia operating system without having to install
-it. Can also be used to install Mageia if you wish.</para>
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade previously installed Mageia
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Contenen programari de propietat.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -95,13 +127,13 @@ releases.</emphasis></para>
         <title>DVD autònom de Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Només entorn d'escriptori Plasma.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Només l'arquitectura de 64 bits.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -109,13 +141,13 @@ releases.</emphasis></para>
         <title>DVD autònom de GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>Només entorn d'escriptori GNOME.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Només l'arquitectura de 64 bits</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -123,13 +155,13 @@ releases.</emphasis></para>
         <title>DVD autònom de Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Només entorn d'escriptori Xfce.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Arquitectures de 32 ó 64 bits.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -140,22 +172,10 @@ releases.</emphasis></para>
         <title>Característiques comunes</title>
         <itemizedlist>
           <listitem>
-            <para>These are minimal ISO's containing no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient if
-bandwidth is too low to download a full DVD, or if you have a PC without a
-DVD drive or is unable to boot from a USB stick.</para>
-          </listitem>
-          <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>First steps are English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -163,8 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -172,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Conté programari de propietat (principalment controladors, còdecs...) per a
-qui el necessiti.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -185,16 +204,23 @@ qui el necessiti.</para>
       <title>Baixada</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, you are provided with some information, such as
-the mirror in use and an option to switch if the bandwidth is too low. If
-http is chosen, you will also see something regarding checksums.</para>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the
-other, and copy the checksum <link linkend="integrity">for later
-use</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
@@ -202,53 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
 algorithm from the file to be downloaded. You may compare the checksum of
 your downloaded ISO against that of the original source ISO. If the
 checksums do not match, it means that the actual data on the ISO's do not
-match, and if it is the case, then you should retry the download or attempt
-a repair using BitTorrent.</para>
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>To generate the checksum for your downloaded ISO, open a console, (no need
 to be root), and:</para>
       <itemizedlist>
         <listitem>
-          <para>To use md5sum, type: <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>To use sha1sum, type: <userinput>sha1sum
-path/to/the/image/file.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Example:</para>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Enregistrament o bolcat de l'ISO</title>
-    <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
-stick. This is not a standard copy operation as a bootable medium will
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
 actually be created.</para>
     <section>
       <title>Gravació de l'ISO a un CD/DVD</title>
-      <para>Whichever software you use, ensure that the option to burn an <emphasis
-role="bold">image</emphasis> is used, burn <emphasis
-role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not
-correct. See <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link> for more information.</para>
     </section>
     <section>
       <title>Bolcat de l'ISO a un llapis de memòria USB</title>
-      <para>Totes les ISO de Mageia són híbrides, que vol dir que les podeu «bolcar» a
-un llapis de memòria USB i després fer-lo servir per a arrencar i instal·lar
-el sistema.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any existing data will be lost and the partition capacity will
-be reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>Per recuperar la capacitat original, heu de refer les particions i tornar a
-formatar la memòria USB.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Using a graphical tool within Mageia</title>
         <para>You can use a graphical tool like <link
@@ -260,7 +296,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <itemizedlist>
           <listitem>
             <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -269,7 +305,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Using Command line within a GNU/Linux system</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk overwriting
 potentially valuable existing data if you specify the wrong target device.</para>
@@ -279,27 +315,27 @@ potentially valuable existing data if you specify the wrong target device.</para
             <para>Obriu una consola</para>
           </listitem>
           <listitem>
-            <para>Become a root (Administrator) user with the command <userinput>su
--</userinput> (don't forget the final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Plug in your USB stick (do not mount it, this also means do not open any
-application or file manager that could access or read it)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Introduïu l'ordre <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
             <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
             <para>Alternatively, you can find the device name with the command
-<code>dmesg</code>: towards the end of this example, you can see the device
-name starting with <emphasis>sd</emphasis>, and in this case,
-<emphasis>sdd</emphasis> is the actual device. You can also see that its
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
 size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
@@ -321,21 +357,22 @@ size is 2GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: <emphasis role="bold"># <userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Where X=your device name eg: /dev/sdd</para>
-            <para>Example:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-and <emphasis role="bold">of</emphasis> stands for <emphasis
-role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Introduïu l'ordre: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>This is the end of the process, and you may now unplug your USB stick.</para>
@@ -344,4 +381,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/acceptLicense.xml b/docs/docs/stable/installer/ca/acceptLicense.xml
index 57b25f46..b36c0834 100644
--- a/docs/docs/stable/installer/ca/acceptLicense.xml
+++ b/docs/docs/stable/installer/ca/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Llicència i notes de la versió</title>
   </info>
 
@@ -46,17 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">Acord de llicència</title>
     </info>
 
-    <para>Abans d'instal·lar <application>Mageia</application>, llegiu atentament els
-termes i les condicions de la llicència.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Aquests termes i condicions s'apliquen a la totalitat de la distribució
-<application>Mageia</application> i cal acceptar-los abans de continuar.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>To proceed, simply select <guilabel>Accept</guilabel> and then click on
-<guibutton>Next</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Si decidiu no acceptar aquestes condicions, us agraïm el vostre
-interès. Fent clic a <guibutton>Surt</guibutton> l'ordinador es reiniciarà.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -74,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Important information about this release of
-<application>Mageia</application> can be viewed by clicking on the
-<guibutton>Release Notes</guibutton> button.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/addUser.xml b/docs/docs/stable/installer/ca/addUser.xml
index 6d4351a6..78fcc4dd 100644
--- a/docs/docs/stable/installer/ca/addUser.xml
+++ b/docs/docs/stable/installer/ca/addUser.xml
@@ -1,32 +1,51 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ca" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Gestió d'usuaris i superusuari</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Estableix la contrasenya d'administrador (root):</title>
     </info>
 
-    <para>It is advisable for all <application>Mageia</application> installations to
-set a <emphasis role="bold">superuser</emphasis> (administrator) password,
-usually called the <emphasis>root password</emphasis> in Linux. As you type
-a password into the top box a shield will change from red to yellow to green
-depending on the strength of the password. A green shield shows you are
-using a strong password. You need to repeat the same password in the box
-underneath, to check that the first entry was not mistyped.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>All passwords are case sensitive. It is best to use a mixture of letters
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
 (upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
@@ -36,42 +55,46 @@ underneath, to check that the first entry was not mistyped.</para>
       <title xml:id="enterUser-ti3">Introduïu un usuari</title>
     </info>
 
-    <para>Add a user here. A regular user has fewer privileges than the <emphasis
-role="bold">superuser</emphasis> (root), but enough to use the internet,
-office applications or play games and anything else the average user might
-use their computer for.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Icona</guibutton>: si feu clic en aquest botó, canviarà la icona
-d'usuari.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Nom real</guilabel>: poseu-hi el nom real de l'usuari.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use
-a version of the user's real name. <emphasis role="bold">The login name is
-case sensitive.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password</guilabel>: Type in the user password. There is a shield
-at the end of the text box that indicates the strength of the password. (See
-also <xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password (again)</guilabel>: Retype the user password DrakX will
-check that you have not mistyped the password.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Any users you added while installing Mageia, will have a home directory that
-is both read and write protected (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
@@ -81,32 +104,31 @@ management</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Gestió avançada d'usuaris</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>The <guibutton>Advanced</guibutton> option allows you to edit further
-settings for the user you are adding.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
-<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis>
-and <emphasis role="bold">Sh</emphasis></para>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the <emphasis
-role="bold">user ID</emphasis> for any user you added in the previous
-screen. If you are unsure what the purpose of this is, then leave it blank.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ca/add_supplemental_media.xml b/docs/docs/stable/installer/ca/add_supplemental_media.xml
index a853d487..822ae20c 100644
--- a/docs/docs/stable/installer/ca/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/ca/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="ca">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Selecció dels mitjans (configura els mitjans d'instal·lació suplementaris)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,43 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>This screen shows you the list of already recognized repositories. You can
-add other sources for packages, like an optical disc or a remote source.
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
 The source selection determines which packages will be available during the
-next steps.</para>
+subsequent steps.</para>
 
   <para>Per a un origen en xarxa cal seguir dos passos:</para>
 
   <orderedlist>
     <listitem>
-      <para>Tria i activació de la xarxa, si encara no està activa.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
       <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
 mirror, you have access to the selection of all repositories managed by
-Mageia, like the <emphasis role="bold">Nonfree</emphasis>, the <emphasis
-role="bold">Tainted</emphasis> repositories and the <emphasis
-role="bold">Updates</emphasis>. With the URL, you can designate a specific
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
 repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>If you are updating a 64 bit installation which may contain some 32 bit
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
 packages, it is advised to use this screen to add an online mirror by
-ticking one of the Network protocols here. The 64-bit DVD ISO only contains
-64-bit and noarch packages, it will not be able to update the 32-bit
-packages. However, after adding an online mirror, the installer will find
-the needed 32-bit packages there.</para>
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/ask_mntpoint_s.xml b/docs/docs/stable/installer/ca/ask_mntpoint_s.xml
index 51bce9e6..0ffee337 100644
--- a/docs/docs/stable/installer/ca/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/ca/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="ca">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Tria dels punts de muntatge</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Aquí podeu veure les particions Linux que s'han trobat a l'ordinador. Si no
-esteu d'acord amb els suggeriments de <application>DrakX</application>,
-podeu canviar els punts de muntatge.</para>
-
-  <note>
-    <para>If you change anything, make sure you still have a <emphasis
-role="bold"><literal>/</literal></emphasis> (root) partition.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis
-role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
-name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis>
-(for example, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>If you have several partitions, you can choose various different mount
-points from the drop down menu, such as <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis
-role="bold">/var</emphasis>. You can even make your own mount points, for
-instance <emphasis role="bold"><literal>/video</literal></emphasis> for a
-partition where you want to store your films, or <emphasis
-role="bold">/Data</emphasis> (or some other name) for your data.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -79,13 +82,17 @@ mount point field blank.</para>
   </itemizedlist>
 
   <warning>
-    <para>If you are not sure what to choose, click <emphasis
-role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
-disk partitioning</guilabel>, where, you can click on a partition to see its
-type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Si esteu segur que els punts de muntatge són correctes, feu clic a
-<guibutton>Següent</guibutton>, i trieu si voleu formatar les particions
-suggerides per DrakX, o bé més.</para>
-</section>
\ No newline at end of file
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/ca/bestTime.xml b/docs/docs/stable/installer/ca/bestTime.xml
index 41506677..ec7311ff 100644
--- a/docs/docs/stable/installer/ca/bestTime.xml
+++ b/docs/docs/stable/installer/ca/bestTime.xml
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ca" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ca" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Paràmetres del rellotge</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>In this step, you have to select on which time your internal clock is set,
-either local time or UTC time.</para>
-
-  <para>A la pestanya de paràmetres avançats trobareu més opcions sobre els
-paràmetres del rellotge.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/bootLive.xml b/docs/docs/stable/installer/ca/bootLive.xml
index e099a0a3..2fe7ca69 100644
--- a/docs/docs/stable/installer/ca/bootLive.xml
+++ b/docs/docs/stable/installer/ca/bootLive.xml
@@ -1,29 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="ca"><info><title xml:id="bootLive-ti1">Arrencada de Mageia com a sistema autònom</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Arrencada del mitjà</title></info><section><info><title xml:id="bootLive11-ti1">Des d'un disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
-DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
-bootloader to launch the installation automatically after rebooting the
-computer. If that does not happen you may need to reconfigure your BIOS or
-press one key that will offer you to choose the peripheral from which the
-computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">Des d'un dispositiu USB</title></info><para>You can boot from the USB device on which you dumped your image
-ISO. According to your BIOS settings, the computer boots perhaps directly on
-the USB device already plugged in a port. If that does not happen you may
-need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">En mode BIOS/CSM/Legacy</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>La primera pantalla de l'arrencada en mode BIOS</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
-or USB stick) without writing anything on the disk, so expect a very slow
-system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
-when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
-the inserted installation medium. Here, select other sources, like FTP or
-NFS servers. If the installation is carried out in a network with an SLP
-server, select one of the installation sources available on the server with
-this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
-optional disk with a driver update and will require its insertion during
-installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">En mode UEFI</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>La primera pantalla de l'arrencada en un sistema UEFI des del disc</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice)  or to
-process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
-duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para><para>In each case, the first steps will be the same to choose language, timezone
-and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Arrencada de Mageia com a sistema autònom</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Arrencada del mitjà</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">En mode BIOS/CSM/Legacy</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>La primera pantalla de l'arrencada en mode BIOS</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">En mode UEFI</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/ca/chooseDesktop.xml b/docs/docs/stable/installer/ca/chooseDesktop.xml
index 9d7236aa..e9fec05a 100644
--- a/docs/docs/stable/installer/ca/chooseDesktop.xml
+++ b/docs/docs/stable/installer/ca/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ca" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Selecció de l'escriptori</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Selecció de l'escriptori</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide-show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> or <application>GNOME</application>
-desktop environment. Both come with a full set of useful applications and
-tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
-use both), or if you want to modify the default software choices for these
-desktop environments. The <application>LXDE</application> desktop, for
-instance, is lighter than the previous two, sporting less eye candy and
-fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/ca/choosePackageGroups.xml b/docs/docs/stable/installer/ca/choosePackageGroups.xml
index 3c5107bc..1d447421 100644
--- a/docs/docs/stable/installer/ca/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/ca/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ca" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ca" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Selecció de grups de paquets</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/ca/choosePackagesTree.xml b/docs/docs/stable/installer/ca/choosePackagesTree.xml
index 9be5c45e..dd6f8d05 100644
--- a/docs/docs/stable/installer/ca/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/ca/choosePackagesTree.xml
@@ -1,21 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="ca">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="ca">
   <info>
     <title xml:id="choosePackagesTree-ti1">Tria de paquets individuals</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-  <para>Després de la tria podeu fer clic a la <guibutton>icona del
-disquet</guibutton> al capdavall de la pàgina per a desar la selecció de
-paquets (també es pot desar en una clau USB). Més endavant podreu utilitzar
-aquest fitxer per instal·lar els mateixos paquets en un altre sistema si
-premeu el mateix botó durant la instal·lació i trieu l'opció de carregar-lo.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/configureServices.xml b/docs/docs/stable/installer/ca/configureServices.xml
index 64acd903..d5530855 100644
--- a/docs/docs/stable/installer/ca/configureServices.xml
+++ b/docs/docs/stable/installer/ca/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ca" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="ca" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Configuració dels serveis</title>
   </info>
@@ -7,19 +7,30 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose are usually good.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">Si realceu un servei, se us en mostrarà informació a la casella inferior.</para>
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Si realceu un servei, se us en mostrarà informació a la casella inferior.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Canvieu coses només si teniu molt clar què esteu fent.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/configureTimezoneUTC.xml b/docs/docs/stable/installer/ca/configureTimezoneUTC.xml
index fe33860a..ac6c0b2f 100644
--- a/docs/docs/stable/installer/ca/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/ca/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="ca">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="ca">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Configuració de la zona horària</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the
-same time-zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
 or to GMT, also known as UTC.</para>
diff --git a/docs/docs/stable/installer/ca/configureX_card_list.xml b/docs/docs/stable/installer/ca/configureX_card_list.xml
index 71db58a6..904ff8c5 100644
--- a/docs/docs/stable/installer/ca/configureX_card_list.xml
+++ b/docs/docs/stable/installer/ca/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="ca">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Tria del servidor de les X (configura la targeta gràfica)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX té una base de dades de targetes de vídeo força completa i normalment
 identifica correctament el dispositiu de vídeo.</para>
@@ -29,33 +42,34 @@ identifica correctament el dispositiu de vídeo.</para>
   <para>Si l'instal·lador no ha detectat correctament la targeta gràfica i sabeu
 quina és, seleccioneu-la a l'arbre: <itemizedlist>
       <listitem>
-        <para>fabricant</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>llavors el nom de la targeta</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>i el tipus de targeta</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-<emphasis role="bold">Xorg</emphasis> category, which provides more than 40
-generic and open source video card drivers. If you still can't find a
-specific driver for your card there is the option of using the <emphasis
-role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the <emphasis role="bold">Command-line</emphasis> Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the <emphasis role="bold">Nonfree</emphasis>
-repository and in some cases only from the card manufacturers' websites.</para>
-
-  <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be
-explicitly enabled to access them. If you didn't enable it previously, you
-should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/ca/configureX_chooser.xml b/docs/docs/stable/installer/ca/configureX_chooser.xml
index 848cc6d3..4b3d6486 100644
--- a/docs/docs/stable/installer/ca/configureX_chooser.xml
+++ b/docs/docs/stable/installer/ca/configureX_chooser.xml
@@ -1,62 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="ca">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Configuració de targeta gràfica i monitor</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym> or any other graphical environment to work well, the
-following <acronym>X</acronym> settings need to be correct. Choose the
-correct settings if none are shown, or if you think the details are
-incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Targeta gràfica</guibutton></emphasis>: si cal, trieu
-la vostra targeta de la llista.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from
-the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose
-<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and
-vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Freqüències de refresc incorrectes poden fer malbé el monitor</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and
-color depth of your monitor can be set here.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the option is there, and you test your
-settings, you should be ask whether your settings are correct. If you answer
-<emphasis role="bold">yes</emphasis>, the settings will be kept. If you
-don't see anything, you'll return to the configuration screen and be able to
-reconfigure everything until the test result is satisfactory. If the test
-option is not available, then make sure your settings are on the safe side.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Opcions</guibutton></emphasis>: aquí podeu triar
-activar o desactivar diverses opcions.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/ca/configureX_monitor.xml b/docs/docs/stable/installer/ca/configureX_monitor.xml
index c3f79703..1b95a18d 100644
--- a/docs/docs/stable/installer/ca/configureX_monitor.xml
+++ b/docs/docs/stable/installer/ca/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="ca">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,65 +23,82 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Tria del monitor</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX té una base de dades de monitors força completa i normalment
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX té una base de dades de monitors força completa i normalment
 identificarà correctament el vostre.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
 could damage your monitor or video hardware. Please don't try something
 without knowing what you are doing.</emphasis> If in doubt you should
 consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Personalitzat</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Aquesta opció us permet especificar dos paràmetres crítics, la freqüència de
-refresc vertical i la freqüència de sincronisme horitzontal. La freqüència
-de refresc vertical determina a quina freqüència es refresca la pantalla i
-la freqüència de sincronisme horitzontal determina a quina freqüència es
-mostren les línies.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">És <emphasis>MOLT IMPORTANT</emphasis> que no especifiqueu un tipus de
+        <para revision="1" xml:id="configureX_monitor-pa4">És <emphasis>MOLT IMPORTANT</emphasis> que no especifiqueu un tipus de
 monitor amb un interval de sincronismes que superi les capacitats del vostre
 monitor: podríeu fer-lo malbé. En cas de dubte, trieu una configuració
 conservadora i consulteu la documentació del monitor.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Integració automàtica</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">Aquesta és l'opció predeterminada i tracta d'establir el tipus de monitor a
-partir de la base de dades.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Proveïdor</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">Si l'instal·lador no ha detectat correctament el monitor i sabeu quin és, el
-podeu seleccionar de l'arbre: <itemizedlist>
       <listitem>
-        <para>fabricant</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>el nom dels fabricants del monitor</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>descripció del monitor</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Si l'instal·lador no ha detectat correctament el monitor i sabeu quin és, el
+podeu seleccionar de l'arbre:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Genèric</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the <emphasis
-role="bold">Vesa</emphasis> card driver when your video hardware cannot be
-determined automatically. Once again it may be wise to be conservative in
-your selections.</para>
-</section>
\ No newline at end of file
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/ca/diskPartitioning.xml b/docs/docs/stable/installer/ca/diskPartitioning.xml
new file mode 100644
index 00000000..1c7456c9
--- /dev/null
+++ b/docs/docs/stable/installer/ca/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="ca" version="5.0" xml:lang="ca">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/diskdrake.xml b/docs/docs/stable/installer/ca/diskdrake.xml
index 8cfd2895..6d3691b8 100644
--- a/docs/docs/stable/installer/ca/diskdrake.xml
+++ b/docs/docs/stable/installer/ca/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ca" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Particions personalitzades del disc amb DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis>
-partition you must ensure that you have a separate <emphasis
-role="bold">/boot</emphasis> partition. The encryption option for the
-<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise
-your system will be unbootable.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view their details before you start.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage
-device like a USB key). In the screen-shot above there are two available
-devices: <emphasis role="bold">sda </emphasis>and <emphasis
-role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if
-you are sure you want to wipe all partitions on the selected storage device.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Expert mode</guibutton> provides more options such as a label
-(give a name to) a partition, or to choose a partition type.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Feu clic a <guibutton>Fet</guibutton> quan estigueu a punt.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
-Partition) is present and correctly mounted on /boot/EFI (see below)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/ca/doPartitionDisks.xml b/docs/docs/stable/installer/ca/doPartitionDisks.xml
index e8987b9f..52533a3e 100644
--- a/docs/docs/stable/installer/ca/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/ca/doPartitionDisks.xml
@@ -1,54 +1,95 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ca" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Particions</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the
-DrakX partitioning proposals for where to install
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the
-layout and content of your particular hard drive(s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Utilitza les particions existents</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">Si aquesta opció està disponible, vol dir que s'han trobat particions
+      <para revision="1" xml:id="doPartitionDisks-pa5">Si aquesta opció està disponible, vol dir que s'han trobat particions
 compatibles amb Linux i es podrien utilitzar per a la instal·lació.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Utilitza l'espai lliure</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">Si teniu espai lliure al disc dur, aquesta opció l'aprofitarà per a la
+      <para revision="1" xml:id="doPartitionDisks-pa7">Si teniu espai lliure al disc dur, aquesta opció l'aprofitarà per a la
 instal·lació de Mageia.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Utilitza l'espai lliure en una partició Windows</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">Si teniu espai lliure en una partició Windows existent, pot ser que
-l'instal·lador us proposi utilitzar-la.</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">Aquesta és una bona manera de fer lloc per a la nova instal·lació de Mageia,
-però és una operació arriscada i per tant hauríeu d'estar segur d'haver fet
-una còpia de seguretat dels fitxers importants.</para>
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Tingueu present que això implica encongir la partició de Windows. La
 partició ha d'estar «neta», és a dir, Windows s'ha d'haver tancat
 correctament la darrera vegada que es va fer servir. També cal que hagi
@@ -56,118 +97,119 @@ estat desfragmentada, tot i que això no és garantia que els fitxers de la
 partició hagin estat desplaçats fora de la regió que s'està a punt de fer
 servir. És altament recomanable fer una còpia de seguretat dels fitxers
 personals.</para>
+      </important>
+    </listitem>
 
-        <para>With this option, the installer displays the remaining Windows partition in
-light blue and the proposed Mageia partition in dark blue with their
-intended sizes just underneath. You have the option to modify these sizes by
-clicking and dragging the gap between both partitions. See the following
-screen-shot.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Esborra i utilitza el disc sencer.</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">This option will allocate the entire drive for Mageia.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Nota! Això esborrarà TOTES les dades del disc dur seleccionat. Vigileu!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">Aquesta opció us dóna control total sobre la localització de la instal·lació
+al(s) disc(s) dur(s).</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">Si teniu pensat fer servir part del disc per a alguna altra cosa, o bé ja
-teniu dades al disc que no voleu perdre, llavors no feu servir aquesta
-opció.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Particions personalitzades de disc</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">Aquesta opció us dóna control total sobre la localització de la instal·lació
-al(s) disc(s) dur(s).</para>
-      </listitem>
-    </itemizedlist></para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para>If you are not using the <emphasis role="bold">Custom disk
-partitioning</emphasis> option, the installer will allocate the available
-space according to the following rules:</para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>If the total available space is less than 50 GB, then only one partition is
-created. This will be the <emphasis role="bold">/</emphasis> (root)
-partition.</para>
-      </listitem>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-      <listitem>
-        <para>If the total available space is greater than 50 GB, then three partitions
-are created</para>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 of the total available place is allocated to <emphasis
-role="bold">/</emphasis> with a maximum of 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 is allocated to swap with a maximum of 4 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>the rest (at least 12/19) is allocated to <emphasis
-role="bold">/home.</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-  <para>That means that from 160 GB or greater available space, the installer will
-create three partitions: 50 GB for <emphasis role="bold">/</emphasis>, 4 GB
-for <emphasis role="bold">swap</emphasis> and the remainder for <emphasis
-role="bold">/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
-automatically detected - or created if it does not exist yet, and mounted on
-/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to
-create a BIOS boot partition if not already existing. It is a roughly 1 MiB
-partition with no mount point. Choose <xref linkend="diskdrake"/> to be able
-to create it with the Installer like any other partition, just select BIOS
-boot partition as the filesystem type.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512. Due to lack of available hardware, the
 partitioning tool used in the installer has not been tested with such a
-drive. Also some SSD devices now use an erase block size over 1 MB. If you
-have such a device we suggest that you partition the drive in advance, using
-an alternative partitioning tool like <emphasis
-role="bold">gparted</emphasis>, and to use the following settings:</para>
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/ca/exitInstall.xml b/docs/docs/stable/installer/ca/exitInstall.xml
index 4f4f3fc6..df328594 100644
--- a/docs/docs/stable/installer/ca/exitInstall.xml
+++ b/docs/docs/stable/installer/ca/exitInstall.xml
@@ -5,21 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">Heu acabat d'instal·lar i configurar <application>Mageia</application> i ara
-és segur treure el mitjà d'instal·lació i arrencar de nou l'ordinador.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems (if there are more than one) on your computer.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">Si no heu ajustat els paràmetres del gestor d'arrencada, automàticament se
 seleccionarà i iniciarà la vostra instal·lació de Mageia.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Gaudiu!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Visiteu www.mageia.org si teniu algun dubte o voleu col·laborar amb Mageia.</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/firewall.xml b/docs/docs/stable/installer/ca/firewall.xml
index 56b4f971..f6c60729 100644
--- a/docs/docs/stable/installer/ca/firewall.xml
+++ b/docs/docs/stable/installer/ca/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="ca">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="ca" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Tallafoc</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Tallafoc</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
   <para>In the default setting (no button is checked), no service of the system is
-accessible from the network. The <emphasis role="bold">Everything (no
-firewall)</emphasis> enables access to all services of the machine - an
-option that does not make much sense in the context of the installer since
-it would create a totally unprotected system. Its veritable use is in the
-context of the Mageia Control Center (which uses the same GUI layout) for
-temporarily disabling the entire set of firewall rules for testing and
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
 debugging purposes.</para>
 
   <para>All other options are more or less self-explanatory. As an example, you will
-enable the <emphasis role="bold">CUPS server</emphasis> if you want printers
-on your machine to be accessible from the network.</para>
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where
-you can enable a series of services by typing a list of couples (blank
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
diff --git a/docs/docs/stable/installer/ca/formatPartitions.xml b/docs/docs/stable/installer/ca/formatPartitions.xml
index e5d67253..62762dde 100644
--- a/docs/docs/stable/installer/ca/formatPartitions.xml
+++ b/docs/docs/stable/installer/ca/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="ca">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formatació</title>
   </info>
@@ -11,32 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
 partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Normalment cal formatar com a mínim les particions seleccionades per DrakX.</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Feu clic a <guibutton>Avançat</guibutton> per a triar les particions on
-voleu comprovar si hi ha <emphasis>blocs defectuosos</emphasis>.</para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen,
-where you can choose to view details of your partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">Quan estigueu segur de la selecció feu clic a <guibutton>Següent</guibutton>
-per continuar.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/ca/graphicalConfiguration.xml b/docs/docs/stable/installer/ca/graphicalConfiguration.xml
new file mode 100644
index 00000000..a0e834b9
--- /dev/null
+++ b/docs/docs/stable/installer/ca/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/ca/installUpdates.xml b/docs/docs/stable/installer/ca/installUpdates.xml
index 5044bdfe..6c9d0d4a 100644
--- a/docs/docs/stable/installer/ca/installUpdates.xml
+++ b/docs/docs/stable/installer/ca/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="ca">
-  <info>
-    <title xml:id="installUpdates-ti1">Actualitzacions</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Actualitzacions</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Des del llançament d'aquesta versió de <application>Mageia</application>
-s'han actualitzat o millorat alguns paquets.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them,
-select <guilabel>No</guilabel> if you don't want to do this now, or if you
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
 aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Press <guibutton>Next</guibutton> to continue</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/installer.xml b/docs/docs/stable/installer/ca/installer.xml
index 2222fede..a6fcecf7 100644
--- a/docs/docs/stable/installer/ca/installer.xml
+++ b/docs/docs/stable/installer/ca/installer.xml
@@ -6,165 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, l'instal·lador de Mageia</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, l'instal·lador de Mageia</title>
   </info>
 
   <para>Tant si sou nou en GNU-Linux com si sou un usuari amb experiència,
 l'instal·lador de Mageia està dissenyat per a ajudar-vos a fer la
 instal·lació o actualització tan fàcil com sigui possible.</para>
 
-  <para>La pantalla del menú inicial té diverses opcions, però l'opció
-predeterminada engegarà l'instal·lador, que normalment és tot el que cal.</para>
+  <section>
+    <title>Passos de la instal·lació</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Pantalla de benvinguda de la instal·lació</title>
 
-    <section>
-      <title>Ús d'un DVD de Mageia</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>From this screen, you have access to options by pressing "<emphasis
-role="bold">e</emphasis>" to enter the edit mode. To come back to this
-screen, press either <emphasis role="bold">Esc</emphasis> key to quit
-without saving or press the key <emphasis role="bold">Ctrl</emphasis> or
-<emphasis role="bold">F10</emphasis> to quit with saving.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, it is possible to set some preferences (note that the
-options <emphasis role="bold">F1</emphasis> to <emphasis
-role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist>
-          <listitem>
-            <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis
-role="bold">F6</emphasis> options, you can view relevant help by pressing
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a
-specific language for the installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>If needed, change the screen resolution by pressing <emphasis
-role="bold">F3</emphasis> (Legacy mode only).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis role="bold">F6</emphasis> <emphasis
-role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis
-role="bold">e</emphasis> instead).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Default: It doesn't alter anything in the default options.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: Priority is given to the safer options at the price of a
-performance detriment.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI: (Advanced Configuration and Power Interface): Power management
-features are not used.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU
-interrupt. Select this option if you experience system misbehaviour like a
-kernel panic in relation to APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>When you select one of these entries, it modifies the default options
-displayed in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with
-<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot
-Options</guilabel> line, despite this, they will in fact be applied.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various
-boot options. Select an item with the arrow keys and press <emphasis
-role="bold">Enter</emphasis> for more details or press <emphasis
-role="bold">Esc</emphasis> to go back to the welcome screen.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>The detailed view about the splash option. Press <emphasis
-role="bold">Esc</emphasis> or select <guilabel>Return to Boot
-Options</guilabel> to go back to the options list. These options can be
-added by hand in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>For more information about kernel options on legacy and UEFI systems, see:
-<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>Passos de la instal·lació</title>
+    <section>
+      <title>UEFI Systems</title>
 
-    <para>The install process is divided into a number of steps, the status of which
-is indicated in a panel to the left of the screen.</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
-options.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
-about the particular step.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
-is possible to reboot, but please think twice before you do this. Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -175,20 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>Després de la pantalla inicial no arriba a la pàgina de selecció de
-l'idioma. Això pot passar amb algunes targetes gràfiques de sistemes
-antics. Proveu de fer servir una resolució baixa, teclejant
-<code>vgalo</code> a la consola.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this press <emphasis role="bold">Esc</emphasis> at the first welcome screen
-and confirm with <emphasis role="bold">ENTER</emphasis>. You will be
-presented with a black screen with the word "boot:". Type "text" and press
-<emphasis role="bold">ENTER</emphasis> to continue with the installation in
-text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -196,11 +195,11 @@ text mode.</para>
     <section>
       <title>La instal·lació es penja</title>
 
-      <para>Si el sistema sembla que es congela durant la instal·lació, pot ser a causa
-d'un problema en la detecció del maquinari. En aquest cas, podeu saltar la
-detecció automàtica i deixar-la per més tard. Per a provar-ho, teclegeu
-<code>noauto</code> a la consola. Si cal, aquesta opció es pot combinar amb
-d'altres.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -208,17 +207,18 @@ d'altres.</para>
 
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Particions dinàmiques</title>
 
-      <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis>
-format to <emphasis role="bold">dynamic</emphasis> format in Microsoft
-Windows, then it is not possible to install Mageia on this disc. To revert
-to a basic disk, see the Microsoft documentation: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/ca/locale.xml b/docs/docs/stable/installer/ca/locale.xml
new file mode 100644
index 00000000..1c8103a9
--- /dev/null
+++ b/docs/docs/stable/installer/ca/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/ca/login.xml b/docs/docs/stable/installer/ca/login.xml
index c5356bd4..be9bd02b 100644
--- a/docs/docs/stable/installer/ca/login.xml
+++ b/docs/docs/stable/installer/ca/login.xml
@@ -1,5 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="ca"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
-yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para><para>Els podeu trobar <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">aquí</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="ca">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/media_selection.xml b/docs/docs/stable/installer/ca/media_selection.xml
index 8c909634..36cf1f96 100644
--- a/docs/docs/stable/installer/ca/media_selection.xml
+++ b/docs/docs/stable/installer/ca/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="ca">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Selecció del mitjà (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Aquí teniu una llista de tots els dipòsits disponibles. No tots els dipòsits
 estan disponibles, depenent del mitjà que feu servir per a la
@@ -32,11 +41,11 @@ base de la instal·lació.</para>
     </listitem>
 
     <listitem>
-      <para>El dipòsit <emphasis>Nonfree</emphasis> inclou paquets gratuïts, i per tant
-Mageia els pot distribuir, però contenen programari no lliure (d'aquí el nom
-- Nonfree). Per exemple, aquest dipòsit inclou pilots de propietat per a
-targetes gràfiques nVidia i ATI, microprogramari per a diverses targetes
-Wi-Fi, etc.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/ca/minimal-install.xml b/docs/docs/stable/installer/ca/minimal-install.xml
index fa9aa129..cb518bf3 100644
--- a/docs/docs/stable/installer/ca/minimal-install.xml
+++ b/docs/docs/stable/installer/ca/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="ca">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="ca">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Instal·lació mínima</title>
   </info>
@@ -10,26 +13,40 @@
 
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
-  <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+  
 
-  <para>Minimal Installation is intended for those with specific uses in mind for
-<application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the <emphasis
-role="bold">Individual package selection</emphasis> option mentioned above,
-to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>If you choose this installation method, then the relevant screen will offer
-you a few useful extras to install, such as documentation and X.</para>
+  
 
-  <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
 lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para>The basic documentation is provided in the form of man and info pages.  It
-contains the man pages from the <link
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
 Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
diff --git a/docs/docs/stable/installer/ca/misc-params.xml b/docs/docs/stable/installer/ca/misc-params.xml
index d2cfaf3d..7e11d725 100644
--- a/docs/docs/stable/installer/ca/misc-params.xml
+++ b/docs/docs/stable/installer/ca/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ca" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Resum dels paràmetres diversos</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
 
   <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
 the choices you made and on the hardware detected. You can check the
 settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>As a general rule, it is recommended that you accept the default settings
@@ -26,7 +42,7 @@ unless:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>some other factor mentionned in the detailed sections below is an issue.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,46 +54,47 @@ unless:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Zona horària</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
 can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>País / Regió</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
 setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Gestor d'arrencada</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DraxK ha fet una bona tria per a la configuració del gestor d'arrencada.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Per obtenir més informació, consulteu <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Gestió d'usuaris</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Aquí podeu afegir usuaris suplementaris. Cadascun tindrà el seu propi
-directori <literal>/home</literal>.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Serveis</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
 (daemons).  This tool allows you to enable or disable certain processes.</para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Penseu-vos-ho bé abans de canviar res aquí - una errada podria fer que
-l'ordinador no funcionés correctament.</para>
-
-        <para>Per obtenir més informació, consulteu <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -89,7 +106,7 @@ l'ordinador no funcionés correctament.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Teclat</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
 of keyboard.</para>
@@ -101,27 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Ratolí</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Aquí podeu afegir i configurar altres dispositius apuntadors, tauletes,
 ratolins de bola, etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Targeta de so</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The
-option to select a different driver is only given when there is more than
-one driver for your card, but where none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Interfície gràfica</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Aquesta secció us permet configurar la targeta gràfica i les pantalles.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Per obtenir més informació, consulteu <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -136,11 +158,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Xarxa</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, using the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
@@ -150,14 +172,14 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Servidors intermediaris</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">Un servidor intermediari actua entre l'ordinador i internet. Aquesta secció
-us permet configurar el vostre ordinador perquè utilitzi un servidor
-intermediari.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -169,29 +191,31 @@ need to enter here.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Nivell de seguretat</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Aquí podeu establir el nivell de seguretat de l'ordinador. La majoria de
-vegades la configuració predeterminada (Estàndard) és adequada per a un ús
-general.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Trieu l'opció que millor s'adapta a la vostra utilització.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Tallafoc</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">Un tallafoc actua de barrera entre les vostres dades importants i els
-espavilats que ronden per internet amb intenció de comprometre-les o
-robar-les.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Tingueu present que el fet de permetre-ho tot (sense tallafoc) pot ser molt
-arriscat.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/ca/reboot.xml b/docs/docs/stable/installer/ca/reboot.xml
index 10d1a2a7..6443facc 100644
--- a/docs/docs/stable/installer/ca/reboot.xml
+++ b/docs/docs/stable/installer/ca/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ca" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Reinicia</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/ca/securityLevel.xml b/docs/docs/stable/installer/ca/securityLevel.xml
index 019541d8..d0f9450b 100644
--- a/docs/docs/stable/installer/ca/securityLevel.xml
+++ b/docs/docs/stable/installer/ca/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ca" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Nivell de seguretat</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended
-setting for the average user. The <emphasis role="bold">Secure</emphasis>
-setting will create a highly protected system - for instance if the system
-is to be used as a public server.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Security Administrator</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
 which require notification to a system administrator.</para>
 
-  <para>A good, and easy-to-implement, choice is to enter &lt;user>@localhost -
-where &lt;user> is the login name of the user to receive these messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
 be configured for receiving such mail!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/ca/selectCountry.xml b/docs/docs/stable/installer/ca/selectCountry.xml
index 0a149f68..68d3b424 100644
--- a/docs/docs/stable/installer/ca/selectCountry.xml
+++ b/docs/docs/stable/installer/ca/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="ca">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="ca">
   <info>
     <title xml:id="selectCountry-ti1">Selecció de país / regió</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> option and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem that a country from the
-first list was chosen. Please ignore this, as DrakX will apply your actual
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,7 +40,7 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Mètode d'entrada</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
@@ -39,9 +50,9 @@ selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via <emphasis role="bold">Configure
-your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
-running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/selectInstallClass.xml b/docs/docs/stable/installer/ca/selectInstallClass.xml
index bb88d914..5e3c0103 100644
--- a/docs/docs/stable/installer/ca/selectInstallClass.xml
+++ b/docs/docs/stable/installer/ca/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="ca" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Instal·lació o actualització</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Instal·la</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option to perform a fresh installation of
-<application>Mageia</application>. This will format the root partition (/),
-but can preserve a separated /home partition.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Actualització</para>
-
-      <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that has reached
-its End Of Life, then it is better to do a clean install instead while
-preserving your <literal>/home</literal> partition.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that, and only if you are very sure
-rebooting is what you want, go to a text terminal by pressing <guilabel>Alt
-Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the <emphasis role="bold">Install or Upgrade</emphasis>
-screen to the language choice screen by pressing <guilabel>Alt Ctrl
-Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do
-this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ca/selectKeyboard.xml b/docs/docs/stable/installer/ca/selectKeyboard.xml
index 51ed0148..5a611331 100644
--- a/docs/docs/stable/installer/ca/selectKeyboard.xml
+++ b/docs/docs/stable/installer/ca/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="ca">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,19 +19,22 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Teclat</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX selecciona el teclat adequat per al vostre idioma. Si no en troba cap,
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX selecciona el teclat adequat per al vostre idioma. Si no en troba cap,
 triarà la disposició de teclat US.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Assegureu-vos que la selecció és correcta o seleccioneu una altra disposició
+      <para revision="1" xml:id="selectKeyboard-pa2">Assegureu-vos que la selecció és correcta o seleccioneu una altra disposició
 de teclat. Si no sabeu quina disposició té el vostre teclat, mireu a les
 especificacions lliurades amb el vostre sistema, o bé pregunteu-ho al
 proveïdor. Fins i tot pot ser que hi hagi una etiqueta al teclat que
@@ -28,23 +44,22 @@ ca.wikipedia.org/wiki/Mapes_de_teclats</link></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a fuller list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this and
-continue the installation: the keyboard chosen from the full list will be
-applied.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
 extra dialogue screen asking how you would prefer to switch between the
 Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ca/selectKeyboardLive.xml b/docs/docs/stable/installer/ca/selectKeyboardLive.xml
index 029ca70b..07656c67 100644
--- a/docs/docs/stable/installer/ca/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/ca/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ca" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Select keyboard</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>You will be required to set the keyboard layout you wish to use in
-Mageia​​. The default one is selected according to your language and
-timezone previously selected.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/ca/selectLanguage.xml b/docs/docs/stable/installer/ca/selectLanguage.xml
index 90a41fcc..2ef267e2 100644
--- a/docs/docs/stable/installer/ca/selectLanguage.xml
+++ b/docs/docs/stable/installer/ca/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ca" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,50 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Trieu l'idioma que voleu utilitzar</title>
   </info>
 
-  <para condition="classical">Seleccioneu l'idioma preferit, desplegant primer la llista corresponent al
-vostre continent. <application>Mageia</application> farà servir aquesta
-selecció durant la instal·lació i per al sistema instal·lat.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">If it is likely that you (or others) will require several languages to be
-installed on your system, then you should use the <guibutton>Multiple
-languages</guibutton> option to add them now. It will be difficult to add
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
 extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
+  <important condition="classical">
     <para>Even if you choose more than one language, you must first choose one as your
-preferred language in the first language screen. It will also be marked as
-chosen in the multiple languages screen.</para>
-  </warning>
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
-      <para>Si l'idioma del vostre teclat no es correspon amb l'idioma preferit, llavors
-és recomanable instal·lar també l'idioma del vostre teclat.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia uses UTF-8 (Unicode) support by default.</para>
-
-      <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple
-languages</emphasis> screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>You can change the language of your system after installation in the Mageia
-Control Center -> System -> Manage localization for your system.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ca/selectMouse.xml b/docs/docs/stable/installer/ca/selectMouse.xml
index 1bce171f..59b59390 100644
--- a/docs/docs/stable/installer/ca/selectMouse.xml
+++ b/docs/docs/stable/installer/ca/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="ca">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Selecció del ratolí</title>
   </info>
@@ -7,25 +13,28 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Si no us agrada com respon el ratolí, aquí en podeu seleccionar un altre.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Normalment, <guilabel>Universal</guilabel> - <guilabel>Qualsevol ratolí PS/2
-i USB</guilabel> és la millor tria.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Seleccioneu <guilabel>Universal</guilabel> - <guilabel>Força
-evdev</guilabel> per a configurar els botons que no funcionen en un ratolí
-de sis botons o més.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/ca/setupBootloader.xml b/docs/docs/stable/installer/ca/setupBootloader.xml
index 095dc45e..21f6a222 100644
--- a/docs/docs/stable/installer/ca/setupBootloader.xml
+++ b/docs/docs/stable/installer/ca/setupBootloader.xml
@@ -1,146 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="ca" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="ca" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Opcions principals del menú d'arrencada</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Bootloader interface</title>
-    <para>By default, Mageia uses exclusively:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>Els menús gràfics de Mageia són bonics :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot
-choose between the <emphasis role="bold">with</emphasis> or <emphasis
-role="bold">without graphical menu</emphasis> options.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to house the bootloader
-(GRUB2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds GRUB2-efi. Although it is possible to have
-several ESPs, only one is required (and advised), whatever the number of
-operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Ús del gestor d'arrencada de Mageia</title>
-    <para>By default, and according to your system, Mageia writes one of the
-following:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then untick the <emphasis
-role="bold">Probe Foreign OS</emphasis> option.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
   <section>
-    <title>Ús d'un gestor d'arrencada existent</title>
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this documentation, however in most cases it will
-involve running the relevant bootloader installation program which should
-detect and add it automatically. See the documentation for the operating
-system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Opcions</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>First page</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you
-set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be required when booting
-to select a booting entry or change settings. The username is <emphasis
-role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will
-check that it matches with the one above.</para></listitem><listitem><para><guilabel>Advanced</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for power management. It can save energy by
-stopping unused devices.  Deselecting it could be useful if, for example,
-your computer does not support ACPI or if you think the ACPI implementation
-might cause some problems (for instance random reboots or system lockups).</para></listitem><listitem><para><guilabel>Enable SMP</guilabel>: This option enables/disables symmetric
-multiprocessing for multi core processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the operating system access to
-the Advanced Programmable Interrupt Controller. APIC devices permit more
-complex priority models, and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC manages all external
-interrupts for a specific processor in an SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Opcions principals del menú d'arrencada</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Next page</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-to be used by the boot menu. If you click the down triangle you will be
-offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Ús d'un gestor d'arrencada existent</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Addició o modificació d'una entrada al menú d'arrencada</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/setupSCSI.xml b/docs/docs/stable/installer/ca/setupSCSI.xml
index 42097a7b..70a8e58d 100644
--- a/docs/docs/stable/installer/ca/setupSCSI.xml
+++ b/docs/docs/stable/installer/ca/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="ca">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Configuració SCSI</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
 SCSI controllers it may be unable to determine the correct drivers to use
 and subsequently fail to recognise the drive.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s)
-you have.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">Llavors DrakX hauria de ser capaç de configurar els discs correctament.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/ca/software.xml b/docs/docs/stable/installer/ca/software.xml
new file mode 100644
index 00000000..8b3c5499
--- /dev/null
+++ b/docs/docs/stable/installer/ca/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="ca" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ca/soundConfig.xml b/docs/docs/stable/installer/ca/soundConfig.xml
index c2397ab6..ee190ee2 100644
--- a/docs/docs/stable/installer/ca/soundConfig.xml
+++ b/docs/docs/stable/installer/ca/soundConfig.xml
@@ -1,41 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="ca">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Configuració del so</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if one exists.</para>
+  
 
-  <para>El controlador predeterminat hauria de funcionar sense problemes. Tot i
-això, si després de la instal·lació trobeu algun problema, executeu
-<command>draksound</command> o bé inicieu aquesta eina des de l'MCC (centre
-de control de Mageia), triant la pestanya <guilabel>Maquinari</guilabel> i
-clicant a <guilabel>Configuració del so</guilabel> a la part superior dreta
-de la pantalla.</para>
+  
 
-  <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis
-role="bold">Sound Configuration</emphasis> tool screen, click on
-<guibutton>Troubleshooting</guibutton> to find useful advice about how to
-solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Avançat</title>
     </info>
 
-    <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in
-this screen, during install, is useful if there is no default driver and
-there are several drivers available, but you think the installer selected
-the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on <emphasis
-role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ca/takeOverHdConfirm.xml b/docs/docs/stable/installer/ca/takeOverHdConfirm.xml
index cb913f44..e963e966 100644
--- a/docs/docs/stable/installer/ca/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/ca/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="ca">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Confirmació del disc dur que es formatarà</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is
-ok to erase every partition, every operating system and all data that might
-be on that hard disk.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/ca/testing.xml b/docs/docs/stable/installer/ca/testing.xml
index eaf3233a..7f6c74e0 100644
--- a/docs/docs/stable/installer/ca/testing.xml
+++ b/docs/docs/stable/installer/ca/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testing Mageia as Live system</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Live mode</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>Us surt aquesta pantalla si heu seleccionat "Arrenca Mageia". Si no, us surt
-el pas de les <link linkend="doPartitionDisks">particions</link></para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Testing hardware</title>
       </info>
 
-      <para>One of the Live mode goals is to test if the hardware is correctly managed
-by Mageia. You can check if all devices have a driver in the Hardware
-section of the Mageia Control Center. You can test the most current devices:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>graphical card: if you see the previous screen, it's already OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webcam:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>printer: configure it and print a test page</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
       </itemizedlist>
 
-      <para>If all is OK for you, you can process to the installation. If not, you can
-leave with the quit button.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>The configuration settings you made here are kept for the installation.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,14 +68,14 @@ leave with the quit button.</para>
         <title xml:id="testing3-ti1">Launch installation</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>Per llançar el CD o DVD autònom d'instal·lació de Mageia al disc dur o
-dispositiu SSD, només heu de clicar a la icona "Instal·la al disc dur". Us
-sortirà aquesta pantalla i després el pas de les <link
-linkend="doPartitionDisks">particions</link> per a la instal·lació directa.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/ca/uninstall-Mageia.xml b/docs/docs/stable/installer/ca/uninstall-Mageia.xml
index 7366a79b..3daeebca 100644
--- a/docs/docs/stable/installer/ca/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/ca/uninstall-Mageia.xml
@@ -1,30 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="ca">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Desinstal·lació de Mageia</title>
   </info>
 
   
 
+  
+
   <para>If Mageia didn't convince you or you can't install it correctly - in short
 you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-  <para>After your data backup, reboot your Mageia installation DVD and select
-<emphasis role="bold">Rescue system</emphasis>, then, <emphasis
-role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
-will only have Windows, with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>In Windows to recover the space used by Mageia partitions: click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code>. You will recognize a Mageia partition
-because they are labeled <guilabel>Unknown</guilabel>, and also by their
-size and place on the disk. Right click on each of these partitions and
-select <guibutton>Delete</guibutton> to free up the space.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
   <para>If you are using Windows XP, you can create a new partition and format it
-(FAT32 or NTFS). It will get a partition letter.</para>
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>If you have Vista or 7, you have one more possibility, you can extend the
 existing partition that is at the left of the freed space. There are other
@@ -32,4 +45,4 @@ partitioning tools that can be used, such as <emphasis
 role="bold">gparted</emphasis>, available for both Windows and Linux. As
 always, when changing partitions, be very careful to back up anything
 important to you.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ca/unused.xml b/docs/docs/stable/installer/ca/unused.xml
index 59205b1e..96adee1e 100644
--- a/docs/docs/stable/installer/ca/unused.xml
+++ b/docs/docs/stable/installer/ca/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ca" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="ca">
   <info>
     <title xml:id="unused-ti1">Keep or delete unused material</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para>In this step, the installer looks for unused locales packages and unused
-hardware packages. Then it proposes you to delete them. It is a good idea to
-accept, except if you prepare an installation which has to run on different
-hardware.</para>
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
+
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>The next step is the copying of files on hard disk. This takes some
-minutes. At the end, you get a blank screen for some time, it's normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/cs/DrakLive-cover.xml b/docs/docs/stable/installer/cs/DrakLive-cover.xml
index c1557df2..f362fdcd 100644
--- a/docs/docs/stable/installer/cs/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/cs/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="cs" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="cs" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Instalace ze ŽIVÉHO datového nosiče</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Leden 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Instalace ze ŽIVÉHO datového nosiče</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Oficiální dokumentace pro Mageiu</para>
+      <para role="tagline">Oficiální dokumentace pro Mageiu</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Texty a snímky obrazovky v této příručce jsou dostupné pod licencí CC BY-SA
+
+      <para>Texty a snímky obrazovky v této příručce jsou dostupné pod licencí CC BY-SA
 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-            </para>
-            <para>Tato příručka byla vytvořena s pomocí <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Tato příručka byla vytvořena s pomocí <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> vyvinutého <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>em.
-            </para>
-            <para>Byl napsán dobrovolníky v jejich volném čase. Spojte se, prosím, s <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>em.</para>
+
+      <para>Byl napsán dobrovolníky v jejich volném čase. Spojte se, prosím, s <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentačním
-týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para> 
+týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para>
     </cover>
   </info>
+
   <article>
     <title>Instalace ze ŽIVÉHO datového nosiče</title>
-       <para><note>
-          <para>Nikdo se nepotká se všemi instalačními obrazovkami, které vidíte v této
+
+    <para><note>
+        <para>Nikdo se nepotká se všemi instalačními obrazovkami, které vidíte v této
 příručce. Kterou obrazovku uvidíte, záleží na vašem vybavení počítače a na
 volbách, které učiníte během instalace.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/cs/DrakLive.xml b/docs/docs/stable/installer/cs/DrakLive.xml
index d874f7f7..e3546975 100644
--- a/docs/docs/stable/installer/cs/DrakLive.xml
+++ b/docs/docs/stable/installer/cs/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="cs" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="cs" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Instalace ze ŽIVÉHO datového nosiče</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Instalace ze ŽIVÉHO datového nosiče</title>
 
     <cover>
       <para><note>
@@ -17,9 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> vyvinutého <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>em.</para>
 
-      <para>Byl napsán dobrovolníky v jejich volném čase. Spojte se, prosím, s <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentačním
-týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</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>
 
@@ -39,7 +54,12 @@ týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +69,18 @@ týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/cs/DrakX-cover.xml b/docs/docs/stable/installer/cs/DrakX-cover.xml
index b5deca98..fededb74 100644
--- a/docs/docs/stable/installer/cs/DrakX-cover.xml
+++ b/docs/docs/stable/installer/cs/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="cs" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="cs" xml:id="Quick-Startup"
+      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>Instalace pomocí DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Únor 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Únor 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Oficiální dokumentace pro Mageiu</para>
+      <para role="tagline">Oficiální dokumentace pro Mageiu</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>Texty a snímky obrazovky v této příručce jsou dostupné pod licencí CC BY-SA
+
+      <para>Texty a snímky obrazovky v této příručce jsou dostupné pod licencí CC BY-SA
 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Tato příručka byla vytvořena s pomocí <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Tato příručka byla vytvořena s pomocí <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> vyvinutého <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>em.
-	    </para>
-            <para>Byl napsán dobrovolníky v jejich volném čase. Spojte se, prosím, s <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>em.</para>
+
+      <para>Byl napsán dobrovolníky v jejich volném čase. Spojte se, prosím, s <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentačním
-týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para> 
+týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Instalace pomocí DrakX</title>
-       <para><note>
-          <para>Nikdo se nepotká se všemi instalačními obrazovkami, které vidíte v této
+
+    <para><note>
+        <para>Nikdo se nepotká se všemi instalačními obrazovkami, které vidíte v této
 příručce. Kterou obrazovku uvidíte, záleží na vašem vybavení počítače a na
 volbách, které učiníte během instalace.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ volbách, které učiníte během instalace.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/cs/DrakX-inline.xml b/docs/docs/stable/installer/cs/DrakX-inline.xml
new file mode 100644
index 00000000..ae14f825
--- /dev/null
+++ b/docs/docs/stable/installer/cs/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="cs" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Instalace pomocí DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>Nikdo se nepotká se všemi instalačními obrazovkami, které vidíte v této
+příručce. Kterou obrazovku uvidíte, záleží na vašem vybavení počítače a na
+volbách, které učiníte během instalace.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Texty a snímky obrazovky v této příručce jsou dostupné pod licencí CC BY-SA
+3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Tato příručka byla vytvořena s pomocí <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> vyvinutého <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>em.</para>
+
+      <para>Byl napsán dobrovolníky v jejich volném čase. Spojte se, prosím, s <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentačním
+týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/DrakX.xml b/docs/docs/stable/installer/cs/DrakX.xml
index a1054132..c66d8c84 100644
--- a/docs/docs/stable/installer/cs/DrakX.xml
+++ b/docs/docs/stable/installer/cs/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="cs" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="cs" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Instalace pomocí DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Instalace pomocí DrakX</title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ týmem</link>, pokud byste chtěli pomoci tuto příručku vylepšit.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/cs/SelectAndUseISOs2.xml b/docs/docs/stable/installer/cs/SelectAndUseISOs2.xml
index e6854ed3..6ca62ebf 100644
--- a/docs/docs/stable/installer/cs/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/cs/SelectAndUseISOs2.xml
@@ -1,41 +1,75 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="cs" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Vyberte a používejte ISO</title>
   </info>
   <section>
     <title>Úvod</title>
-    <para>Mageia je šířena cestou obrazů ISO. Tato stránka vám pomůže vybrat, který
-obraz vyhovuje vašim potřebám.</para>
-    <para>Jsou tu dvě rodiny nosičů:</para>
+    <para>Mageia is distributed via ISO images. This page will help you to choose
+which image best suits your needs.</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Klasický instalátor: Po zavedení z nosiče bude následovat postup dovolující
-výběr toho, co chcete nainstalovat a jak nastavit váš cílový systém. Toto
-vám dává tu největší pružnost pro vašim potřebám přizpůsobenou
-instalaci. Přesně řečeno jde o možnost výběru, které prostředí pracovní
-plochy si nainstalujete.</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>ŽIVÝ nosič dat: Můžete zavést nosič ve skutečném systému Mageia bez jeho
-instalace, abyste viděli, co dostanete po instalaci. Proces instalace je
-jednodušší, ale dostanete méně možností výběru.</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Podrobnosti jsou uvedeny v dalších částech.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Média</title>
     <section>
       <title>Definice</title>
-      <para>Zde je médiem (nosičem) obrazový soubor ISO, který vám umožňuje instalovat
-a/nebo aktualizovat Mageiu a při rozšíření jakoukoli fyzickou podporu, na
-kterou je soubor ISO zkopírován.</para>
-      <para>Můžete je najít <link
-ns4:href="http://www.mageia.org/en/downloads/">zde</link>.</para>
+      <para>Here, a medium (plural: media) is an ISO image file that allows you to
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
+      <para>You can find Mageia ISO's <link
+ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
     <section>
       <title>Klasické instalační nosiče</title>
@@ -43,23 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">zde</link>.</para>
         <title>Běžné vlastnosti</title>
         <itemizedlist>
           <listitem>
-            <para>Tyto soubory ISO používají tradiční instalátor nazvaný drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
-            <para>Dokáží udělat čistou instalaci nebo aktualizovat z předchozích vydání.</para>
+            <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Různé nosiče pro 32 nebo 64 bitové architektury.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Některé nástroje jsou dostupné na uvítací obrazovce: Záchranný systém,
-paměťový test, nástroj na zjištění hardware.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Každé DVD obsahuje mnohá dostupná prostředí pracovní plochy a jazyky.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Během instalace vám bude dána volba přidat si nesvobodný software.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -70,23 +106,20 @@ paměťový test, nástroj na zjištění hardware.</para>
         <title>Běžné vlastnosti</title>
         <itemizedlist>
           <listitem>
-            <para>Mohou být použity na obhlídku distribuce bez jejího nainstalování na pevný
-disk i na volitelné nainstalování Mageii na váš pevný disk.</para>
+            <para>Can be used to preview the Mageia operating system without having to install
+it</para>
           </listitem>
           <listitem>
-            <para>Každé ISO obsahuje pouze jedno grafické prostředí (KDE - Plasma, GNOME nebo
-Xfce)</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Různé nosiče pro 32 nebo 64 bitové architektury.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Živé soubory ISO mohou být použity jen na vytvoření
-čistých instalací, nemohou být použity na aktualizaci z předchozích
-vydání.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Obsahují nesvobodný software.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -94,13 +127,13 @@ vydání.</emphasis></para>
         <title>Živé DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Pouze KDE Plasma.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Všechny jazyky jsou přítomny.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Pouze 64 bitová architektura.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -108,13 +141,13 @@ vydání.</emphasis></para>
         <title>Live DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>Jen prostředí pracovní plochy GNOME.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Všechny jazyky jsou přítomny.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Pouze 64 bitová architektura</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -122,39 +155,27 @@ vydání.</emphasis></para>
         <title>Živé DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Pouze Xfce.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Všechny jazyky jsou přítomny.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 nebo 64 bitová architektura.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
     </section>
     <section>
-      <title>Jen zaváděcí nosiče CD</title>
+      <title>Net install media</title>
       <section>
         <title>Běžné vlastnosti</title>
         <itemizedlist>
           <listitem>
-            <para>Každý z nich je malý obraz, který neobsahuje víc než to, co je třeba pro
-nastartování drakx instalátoru a nalezení drakx-instalátoru-části2 a dalších
-balíčků, které jsou potřebné pro pokračování a dokončení instalace. Tyto
-balíčky mohou být na pevném disku v PC, na místním disku, na místní síti
-anebo na internetu.</para>
-          </listitem>
-          <listitem>
-            <para>Tyto nosiče jsou velmi lehké (menší než 100 MB) a jsou vhodné, když je
-přenosové pásmo příliš malé na stáhnutí plného DVD, když PC nemá DVD
-mechaniku anebo když PC nedokáže nastartovat ze zařízení USB.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Různé nosiče pro 32 nebo 64 bitové architektury.</para>
-          </listitem>
-          <listitem>
-            <para>Jen anglický jazyk.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -162,8 +183,8 @@ mechaniku anebo když PC nedokáže nastartovat ze zařízení USB.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Obsahuje jen svobodný software, pro ty lidi, kteří upřednostňují nepoužívat
-nesvobodný software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -171,8 +192,7 @@ nesvobodný software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Obsahuje nesvobodný software (většinou ovladače, kodeky...) pro lidi, kteří
-jej potřebují.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -182,64 +202,89 @@ jej potřebují.</para>
     <title>Stahování a zkontrolování nosiče</title>
     <section>
       <title>Stažení</title>
-      <para>Pokud jste si už vybrali váš soubor ISO, můžete ho stáhnout buď pomocí http
-nebo BitTorrentu. V obou případech vám okno podává pár informací, jako jsou
-použitý zrcadlový server a příležitost ke změně, pokud je přenosová rychlost
-příliš nízká. Pokud je vybráno http, můžete uvidět i něco takového</para>
+      <para>Once you have chosen your ISO file, you can download it using either http or
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum a sha1sum jsou nástroje ke zkontrolování neporušenosti souboru
-ISO. Jeden z nich si ponechejte <link linkend="integrity">pro budoucí
-použití</link>. Potom se objeví tomuto podobné okno:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Zaškrtněte přepínací tlačítko Uložit soubor.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Ověřování neporušenosti stáhnutého nosiče</title>
-      <para>Oba kontrolní součty jsou hexadecimální čísla vypočítaná algoritmem ze
-souboru, který má být stáhnut. Když tyto algoritmy požádáte o přepočítání
-tohoto čísla z vašeho stáhnutého souboru, buď dostanete stejné číslo a váš
-stáhnutý soubor je neporušený, nebo se číslo odlišuje a máte poškozený
-soubor. Poškození nabádá k tomu, že byste se měli pokusit stáhnout ISO znovu
-nebo pokusit o opravu pomocí BitTorrentu.</para>
-      <para>Otevřete konzoli, netřeba být superuživatelem (root), a:</para>
-      <para>- pro použití md5sum, napište: [sam@localhost]$ <userinput>md5sum
-cesta/k/obrazovému/souboru.iso</userinput>.</para>
-      <para>- pro použití sha1sum, napište: [sam@localhost]$ <userinput>sha1sum
-cesta/k/obrazovému/souboru.iso</userinput>.</para>
-      <para>a porovnejte získané číslo z vašeho počítače (možná na ně budete muset
-chvilku počkat) s číslem daným Mageiou. Například:</para>
+      <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
+      <para>To generate the checksum for your downloaded ISO, open a console, (no need
+to be root), and:</para>
+      <itemizedlist>
+        <listitem>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+        <listitem>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+      </itemizedlist>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para/>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Vypálení nebo vepsání souboru ISO</title>
-    <para>Zkontrolované ISO může být nyní vypáleno na CD nebo DVD anebo vepsané
-(zapsané) na zařízení USB. Tyto operace nejsou obyčejným kopírováním a cílí
-k vytvoření zaveditelného nosiče.</para>
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
     <section>
       <title>Vypálení souboru ISO na CD/DVD</title>
-      <para>Použijte kterýkoli vypalovací program, který si přejete, ale ujistěte se, že
-vypalovací zařízení je správně nastaveno na <emphasis role="bold">vypálit
-obraz</emphasis>, jelikož vypálit data anebo soubory není správné. Více
-informací je na <link
-ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">Mageia
-wiki</link>.</para>
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
+ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
+wiki</link> for more information.</para>
     </section>
     <section>
       <title>Zapsat ISO na USB flash</title>
-      <para>Všechny soubory ISO Mageii jsou hybridy, což znamená, že je můžete 'vepsat'
-(zapsat) na zařízení USB, a potom je použít na zavedení a instalaci systému.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"vepsání" (zapsání) obrazu na flashové zařízení zničí jakýkoli předešlý
-souborový systém na zařízení; všechna ostatní data budou ztracena a kapacita
-oddílu bude zmenšena na velikost obrazu.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>Pro obnovu původní kapacity, musíte znovu předělat oddíl zařízení USB a
-naformátovat ho.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Použitím grafického nástroje v Mageii</title>
         <para>Můžete použít grafický nástroj, jakým je <link
@@ -248,41 +293,51 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
       <section>
         <title>Použitím grafického nástroje ve Windows</title>
         <para>Můžete vyzkoušet:</para>
-        <para>- <link ns4:href="http://rufus.akeo.ie/?locale=sk_SK">Rufus</link> použitím
-volby "obraz ISO";</para>
-        <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
+        <itemizedlist>
+          <listitem>
+            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
+          </listitem>
+          <listitem>
+            <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
+Imager</link></para>
+          </listitem>
+        </itemizedlist>
       </section>
       <section>
-        <title>Použitím příkazového řádku v systému GNU/Linux</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
-          <para>Je potenciálně "nebezpečné"  dělat to ručně. Riskujete, že přepíšete diskový
-oddíl, zadáte-li nesprávně ID zařízení.</para>
+          <para>It is potentially *dangerous* to do this by hand. You risk overwriting
+potentially valuable existing data if you specify the wrong target device.</para>
         </warning>
-        <para>Též můžete použít nástroj dd v konzoli:</para>
         <orderedlist>
           <listitem>
             <para>Otevřete konzoli</para>
           </listitem>
           <listitem>
-            <para>Staňte se superuživatelem (rootem) použitím příkazu <userinput>su
--</userinput> (nezapomeňte na koncovou pomlčku '-')</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Vsuňte vaše zařízení USB (nepřipojujte je příkazem mount, což znamená,
-neotevírejte žádný program nebo správce souborů, který by ho mohl
-zpřístupnit nebo z něho číst)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Použijte příkaz <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
-            <para>Případně můžete získat název zařízení příkazem <code>dmesg</code>: na konci,
-vidíte název zařízení začínající na <emphasis>sd</emphasis>, a
-<emphasis>sdd</emphasis> v tomto případě:</para>
-            <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
+          </listitem>
+          <listitem>
+            <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+            <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
+            <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
 [72594.770536] usb 1-1: Product: Mass Storage Device
@@ -299,24 +354,28 @@ vidíte název zařízení začínající na <emphasis>sd</emphasis>, a
 [72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
 [72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
 [72595.967251]  <emphasis>sdd</emphasis>: sdd1
-[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
-          </listitem>
-          <listitem>
-            <para>Najděte název zařízení pro vaše zařízení USB (podle jeho velikosti),
-například <code>/dev/sdb</code> na obrázku výše, je to zařízení 8GB USB.</para>
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Vložte příkaz: # <userinput>dd if=cesta/k/ISO/souboru of=/dev/sdX
-bs=1M</userinput></para>
-            <para>kde X=název vašeho zařízení, např. /dev/sdc</para>
-            <para>Příklad: # <userinput>dd if=/home/uživatel/Stahování/Mageia-6-x86_64-DVD.iso
-of=/dev/sdb bs=1M</userinput></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
+            <tip>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
+            </tip>
           </listitem>
           <listitem>
-            <para>Vložte příkaz: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
-            <para>Odpojte vaše zařízení USB. Je hotovo.</para>
+            <para>This is the end of the process, and you may now unplug your USB stick.</para>
           </listitem>
         </orderedlist>
       </section>
diff --git a/docs/docs/stable/installer/cs/acceptLicense.xml b/docs/docs/stable/installer/cs/acceptLicense.xml
index 99e534c1..70f30826 100644
--- a/docs/docs/stable/installer/cs/acceptLicense.xml
+++ b/docs/docs/stable/installer/cs/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,34 +37,44 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Licence a poznámky k vydání</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
-revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
-</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
-revision="5" align="center" condition="live" format="PNG"
-fileref="live-license.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="acceptLicense-im1" fileref="dx2-license.png" align="center"
+revision="4"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-license.png" xml:id="acceptLicense-im2" revision="5"
+align="center" condition="live"/> </imageobject></mediaobject>
 
   <section xml:id="license">
     <info>
       <title xml:id="license-ti1">Licenční ujednání</title>
     </info>
 
-    <para>Před instalací <application>Mageii</application>, si pečlivě přečtěte
-licenční podmínky a ustanovení.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Tyto podmínky a ujednání se vztahují na celou distribuci
-<application>Mageia</application>, dříve než budete moci pokračovat, musí
-být přijaty.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Chcete-li je přijmout, jednoduše vyberte <guilabel>Přijmout</guilabel> a
-poté klepněte na <guibutton>Další</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Pokud se rozhodnete nepřijmout tyto podmínky, pak vám děkujeme za
-nahlédnutí. Klepnutím na <guibutton>Ukončit</guibutton> se restartuje
-počítač.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -76,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Jsou dostupné důležité informace o tomto vydání
-<application>Mageia</application> a jsou dostupné klepnutím na tlačítko
-<guibutton>Poznámky k vydání</guibutton>.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/addUser.xml b/docs/docs/stable/installer/cs/addUser.xml
index 16f4e7b4..bed30c3e 100644
--- a/docs/docs/stable/installer/cs/addUser.xml
+++ b/docs/docs/stable/installer/cs/addUser.xml
@@ -1,107 +1,134 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="cs" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Správa uživatele  a superuživatele</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
+
   
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Nastavení hesla správce (uživatele root):</title>
     </info>
-    <para>Pro všechny instalace <application>Mageii</application> se doporučuje
-nastavit heslo superuživatele anebo správce, které se v Linuxu obyčejně
-nazývá i <emphasis>heslo roota</emphasis>. Když zapisujete heslo do políčka
-nahoře, barva jeho štítu se změní z červené na žlutou a na zelenou, v
-závislosti na síle hesla. Zelený štít ukazuje, že používáte silné
-heslo. Potřebujete zopakovat stejné heslo v políčku umístěném hned pod
-políčkem prvního hesla, přičemž jejich porovnaním se ověří, zda jste v
-prvním políčku neudělali překlep.</para>
+
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
+
     <note xml:id="givePassword">
-      <para>Všechna hesla jsou závislá na velikosti písmen; nejlepší je použít kombinaci
-písmen (velkých a malých), čísel a ostatních znaků.</para>
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
+
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Zadejte uživatele</title>
     </info>
-    <para>Zde přidejte uživatele. Uživatel má méně oprávnění než superuživatel (root),
-ale dost na procházení internetu, používání kancelářskych aplikací anebo
-hraní her a pro cokoli jiného, co se svým počítačem provádí běžný uživatel.</para>
+
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
+
     <itemizedlist>
       <listitem>
-        <para><guibutton>Ikona</guibutton>: Pokud klepnete na toto tlačítko, změní se
-ikona uživatele.</para>
+        <para><emphasis role="bold">Icon</emphasis></para>
+
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Skutečné jméno</guilabel>: Vložte do tohoto textového pole
-skutečné jméno uživatele.</para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Přihlašovací jméno</guilabel>: Zde můžete zadat uživatelské
-přihlašovací jméno, nebo nechat instalační program pokusit se použít
-skutečné jméno uživatele. <emphasis>Přihlašovací jméno je citlivé na
-velikost písmen.</emphasis></para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Heslo</guilabel>: Do tohoto textového pole byste měli napsat heslo
-uživatele. Na konci textového políčka je štít, který naznačuje sílu
-heslu. (Podívejte se i na <xref linkend="givePassword"/>)</para>
-      </listitem>
-      <listitem>
-        <para><guilabel>Heslo (znovu)</guilabel>: Znovu zadejte do tohoto textového pole
-heslo uživatele a drakx zkontroluje, zda máte stejné heslo v každém z
-textových polí pro uživatelské heslo.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
+
     <note>
-      <para>Jakýkoliv uživatel přidaný v průběhu instalace Mageii bude mít chráněn
-domovský adresář proti čtení a zápisu (umask=0027)</para>
-      <para>Můžete přidat všechny další potřebné uživatele v kroku <emphasis>Nastavení -
-Souhrn</emphasis> během instalace. Vyberte si <emphasis>Správa
-uživatelů</emphasis>.</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
+
+      <para>You can add any extra needed users in the <emphasis>Configuration -
+Summary</emphasis> step during the install. Choose <emphasis>User
+management</emphasis>.</para>
+
       <para>Přístupová oprávnění lze změnit také po instalaci.</para>
     </note>
   </section>
-  <section xml:id="addUserAdvanced" condition="classical">
+
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Rozšířená správa uživatelů</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
-    <para>Pokud klepnete na tlačítko <guibutton>pokročilé</guibutton>, bude vám
-nabídnuta obrazovka, která vám dovoluje upravovat nastavení pro uživatele,
-kterého přidáváte.</para>
-    <para condition="classical">Dodatečně můžete zakázat anebo povolit účet hosta.</para>
-    <warning condition="classical">
-      <para>Cokoli, co si host s výchozím hostitelským účtem <emphasis>rbash</emphasis>
-uloží do svého /domovského (/home) adresáře, bude smazáno v okamžiku, kdy se
-odhlásí. Host by si měl uložit svoje důležité soubory na zařízení USB.</para>
-    </warning>
+
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
+
     <itemizedlist>
-      <listitem condition="classical">
-        <para><guilabel>Povolit hostův účet</guilabel>: Zde můžete povolit anebo zakázat
-účet hosta. Hostův účet hostu dovoluje přihlásit se k vašemu počítači a
-používat jej, ale má více omezený přístup než normální uživatelé.</para>
-      </listitem>
       <listitem>
-        <para><guilabel>Shell</guilabel>: Tento rozbalovací seznam vám umožňuje změnit
-shell (překladač příkazů) používaný uživatelem, kterého přidáváte na
-předchozí obrazovce, možnostmi jsou Bash, Dash a Sh.</para>
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>ID uživatele</guilabel>: Zde můžete nastavit uživatelovo ID pro
-uživatele, kterého přidáváte na předchozí obrazovce. Je to číslo. Ponechejte
-je prázdné, pokud nevíte, co děláte.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>ID skupiny</guilabel>: Toto vám umožňuje nastavit ID skupiny. Též
-je to číslo, obyčejně to samé jako pro uživatele. Ponechejte je prázdné,
-pokud nevíte, co děláte.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/cs/add_supplemental_media.xml b/docs/docs/stable/installer/cs/add_supplemental_media.xml
index 223d857b..7670a032 100644
--- a/docs/docs/stable/installer/cs/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/cs/add_supplemental_media.xml
@@ -1,54 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="cs" xml:id="add_supplemental_media"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="cs">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Výběr zdroje (nastavení doplňkových instalačních zdrojů)</title>
-    </info>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
+  </info>
 
   
+
+  
+
+  
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
-<imageobject> <imagedata align="center"
-fileref="dx2-add_supplemental_media.png" format="PNG" revision="1"
-xml:id="dx2-add_supplemental_media-im1"/> </imageobject></mediaobject>
-
-  <para>Tato obrazovka vám dává seznam již rozeznaných úložišť. Můžete přidat další
-zdroje balíčků, jako je optický disk nebo vzdálené zdroje. Výběr zdroje
-určuje, ten který bude dostupný v průběhu následujících kroků pro výběr
-balíčků.</para>
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
+<imageobject> <imagedata format="PNG"
+fileref="dx2-add_supplemental_media.png"
+xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Pro síťové zdroje, jsou zapotřebí dva nasáledijící kroky:</para>
 
   <orderedlist>
     <listitem>
-      <para>Výběr a aktivace sítě, není-li již spuštěna. </para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
-      <para>Výbrat zrcadlo nebo zadat adresu URL (první vstup). Výběrem některého ze
-zrcadel, budete mít přístup k nabídkám všech úložišť spravovaných Mageia,
-jako je Nonfree, Tainted a také k aktualizacím. Pomocí URL, můžete určit
-konkrétní úložiště nebo vlastní instalaci NFS.</para>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
-    <note>
-      <para>Pokud aktualizujete 64 bitovou instalaci, která může obsahovat některé 32
-bitové balíčky, doporučuje se použít tuto obrazovku pro přidání
-internetového zrcadlového serveru zaškrtnutím jednoho ze zdejších síťových
-protokolů. 64-bitový DVD obraz obsahuje jen 64 bitové a nearchové balíčky,
-nebude možné aktualizovat 32 bitové balíčky. Avšak po přidání internetového
-zrcadlového serveru tam instalátor najde potřebné 32 bitové balíčky.</para>
-     </note>
-
-</section>
+  <note>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/ask_mntpoint_s.xml b/docs/docs/stable/installer/cs/ask_mntpoint_s.xml
index 6dd69485..e6abdec5 100644
--- a/docs/docs/stable/installer/cs/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/cs/ask_mntpoint_s.xml
@@ -1,27 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="ask_mntpoint_s" version="5.0" xml:lang="cs">
-
+<section version="5.0" xml:lang="cs" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Zvolte si přípojné body</title>
   </info>
 
   
+
   
+
   
+
   
+
+  
+
+  
+
   
+
   
+
   
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -33,57 +44,55 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
-xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-chooseMountpoints.png" align="center" format="PNG"
-xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
-
-  <para>Zde vidíte Linuxové oddíly, které byly nalezeny na vašem počítači. Pokud
-nesouhlasíte s návrhem <application>DrakX</application>, můžete přípojné
-body změnit.</para>
-
-  <note>
-    <para>Máte-li cokoliv ke změně, ujistěte se, že máte stále <literal>/</literal>
-kořenový oddíl (root).</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
 
-  <itemizedlist>
-    <listitem>
-      <para>Každý oddíl je zobrazen takto: "Zařízení" ("Kapacita", "Přípojný bod",
-"Typ").</para>
-    </listitem>
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
+  <itemizedlist>
     <listitem>
-      <para>"Zařízení", se skládá z "pevného disku", ["číslo disku" (písmeno)], "číslo
-oddílu" (například "sda5").</para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
-    
     <listitem>
-      <para>Pokud máte hodně oddílů, můžete si vybrat mnoho různých přípojných bodů z
-rozbalovací nabídky, jako jsou <literal>/</literal>,
-<literal>/home</literal> a <literal>/var</literal>. Dokonce si můžete udělat
-vlastní přípojné body, například <literal>/video</literal> pro oddíl, kde si
-chcete ukládat své filmy, anebo <literal>/domov-kotel</literal> jako
-domovský oddíl instalace kotle (cauldron).</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
-      <para>Pro oddíly, ke kterým nepotřebujete mít přístup, nemusíte vyplňovat přípojný
-bod.</para>
+      <para>For any partitions that you don't need to make use of, you can leave the
+mount point field blank.</para>
     </listitem>
   </itemizedlist>
 
   <warning>
-    <para>Vyberte <guibutton>Předchozí</guibutton>, pokud si nejste jisti tím, co si
-máte zvolit, a potom zaškrtněte <guilabel>Vlastní rozdělení
-disku</guilabel>. V obrazovce, která následuje, můžete klepnout na oddíl,
-abyste viděli jeho typ a velikost.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Pokud jste si jisti, že přípojné body jsou správně, klepněte na
-<guibutton>Další</guibutton> a vyberte si, zda chcete naformátovat jen ten
-oddíl (resp. oddíly), které DrakX navrhuje, anebo i další.</para>
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
 </section>
diff --git a/docs/docs/stable/installer/cs/bestTime.xml b/docs/docs/stable/installer/cs/bestTime.xml
index 7486aec3..4e01c38d 100644
--- a/docs/docs/stable/installer/cs/bestTime.xml
+++ b/docs/docs/stable/installer/cs/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="cs" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="cs" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Nastavení času</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>V tomto kroku musíte vybrat, na který čas jsou vaše vnitřní hodiny nastaveny
-- buď na místní čas nebo na koordinovaný světový čas (UTC).</para>
-
-  <para>Na kartě pokročilé najdete víc voleb pro nastavení času.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/bootLive.xml b/docs/docs/stable/installer/cs/bootLive.xml
index e4eaf74e..9ddacbd5 100644
--- a/docs/docs/stable/installer/cs/bootLive.xml
+++ b/docs/docs/stable/installer/cs/bootLive.xml
@@ -1,27 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="cs"><info><title xml:id="bootLive-ti1">Zavést Mageiu jako živý systém</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Zavedení z datového nosiče</title></info><section><info><title xml:id="bootLive11-ti1">Z disku</title></info><para>Systém můžete zavést z nosiče, na který jste vypálili svůj obrazový soubor
-(CD, DVD...). Obyčejně jej stačí jen vložit do vaší CD/DVD mechaniky, aby
-zavaděč spustil instalaci automaticky po restartu počítače. pokud se to
-nestane, možná potřebujete přenastavit BIOS anebo stisknout jednu klávesu,
-která vám nabídne vybrat si zařízení, ze kterého se počítač zavede.</para><para>Podle toho, jaké máte vybavení počítače a jak je nastaveno, objeví se buď
-jedna anebo druhá ze dvou níže uvedených obrazovek.</para></section><section><info><title xml:id="bootLive12-ti1">Ze zařízení USB</title></info><para>Počítač můžete spustit ze zařízení USB, na kterém je zaznamenán obraz
-ISO. Vzhledem k nastavení vašeho BIOSu se počítač možná už zavádí přímo ze
-zařízení USB zastrčeného v přípojném místě (portu) počítače. Pokud se tak
-neděje, možná potřebujete přenastavit BIOS anebo stisknout jednu klávesu,
-která vám nabídne výběr zařízení, z něhož se počítač spustí.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">V zastaralém režimu BIOS/CSM</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>První obrazovka během spouštění v režimu BIOS</para></caption></mediaobject><para>V prostřední nabídce máte volbu mezi třemi činnostmi:</para><itemizedlist><listitem><para>Zavést Mageiu: Toto znamená, že Mageia 5 se spustí z připojeného nosiče
-(CD/DVD anebo zařízení USB) bez jakéhokoli zapisování na disk, takže
-očekávejte velmi pomalý systém. Jakmile se zavádění dokončí, můžete
-přikročit i k instalací na pevný disk.</para></listitem><listitem><para>Nainstalovat Mageiu: Tato volba Mageiu přímo nainstaluje na pevný disk.</para></listitem><listitem><para>Spustit z pevného disku: Tato volba dovoluje systém zavést z pevného disku,
-tak jako obyčejně, když není připojen žádný datový nosič (CD/DVD anebo
-zařízení USB). (nepracuje s Mageiou 5).</para></listitem></itemizedlist><para>Ve spodní nabídce jsou Volby zavedení systému:</para><itemizedlist><listitem><para>F1 - Nápověda. Vysvětluje volby "splash", "apm", "acpi" a "Ide"</para></listitem><listitem><para>F2 - Jazyk. Vyberte si pro zobrazení jazyka obrazovek.</para></listitem><listitem><para>F3 - Rozlišení obrazovky. Volba mezi textem, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom anebo Další. Normálně se instalace vykoná z vloženého
-instalačního média. Zde si vybíráte jiné zdroje, jakými jsou FTP anebo
-servery NFS. Pokud se instalace vykonává v síti se serverem SLP, při této
-volbě si vyberte jeden z instalačních zdrojů dostupných na serveru.</para></listitem><listitem><para>F5 - Ovladač. Ano nebo Ne. Systém si je vědom přítomnosti volitelného disku
-s aktualizací ovladače a bude požadovat jeho vložení během procesu
-instalace.</para></listitem><listitem><para>F6 - Volby jádra. Toto je cesta pro zadání voleb vztahujících se k vybavení
-počítače a ovladačům, které se použijí.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">V režimu UEFI</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>První obrazovka během spuštění z disku na systémech UEFI</para></caption></mediaobject><para>Zde máte jen možnost spustit Mageiu v Živém režimu (první volba) nebo
-spustit instalaci (druhá volba).</para><para>Pokud jste počítač spustili ze zařízení USB, dostanete dva doplňující řádky,
-které jsou duplikáty předchozích řádků zakončených zkratkou "USB". Máte je
-vybrat.</para><para>V každém případě budou první kroky stejné - vybrat si jazyk, časovou zónu a
-klávesnici; potom se postupy odlišují v <link linkend="testing">dodatečných
-krocích v Živém režimu</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Zavést Mageiu jako živý systém</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Zavedení z datového nosiče</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">V zastaralém režimu BIOS/CSM</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>První obrazovka během spouštění v režimu BIOS</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">V režimu UEFI</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/cs/chooseDesktop.xml b/docs/docs/stable/installer/cs/chooseDesktop.xml
index e1ce5b82..ba76ee0c 100644
--- a/docs/docs/stable/installer/cs/chooseDesktop.xml
+++ b/docs/docs/stable/installer/cs/chooseDesktop.xml
@@ -1,27 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Výběr pracovního prostředí</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Výběr pracovního prostředí</title>
   </info>
 
   
 
-  <para>V závislosti na vašem výběru zde, vám můžou být nabídnuty další obrazovky
-pro jemné doladění vaší volby.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>Po kroku (resp. krocích) výběru uvidíte během instalace balíčků pohyblivou
-přehlídku snímků. Přehlídka může být vypnuta stisknutím tlačítka
-<guilabel>Podrobnosti</guilabel>.</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Rozhodněte se, zda chcete používat prostředí <application>KDE</application>
-nebo <application>Gnome</application>. Obě prostředí jsou vybavená všemi
-užitečnými aplikacemi a nástroji. Zaškrtněte <guilabel>Vlastní</guilabel>,
-pokud chcete nainstalovat obě prostředí, nebo chcete použít jiné prostředí,
-než tato 2 výchozí. Prostředí <application>LXDE</application> je méně
-náročnější než předchozí 2 prostředí, zároveň však obsahuje méně efektů a
-předinstalovaného softwaru.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/cs/choosePackageGroups.xml b/docs/docs/stable/installer/cs/choosePackageGroups.xml
index afcfb663..ccb7192d 100644
--- a/docs/docs/stable/installer/cs/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/cs/choosePackageGroups.xml
@@ -1,39 +1,42 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Výběr skupiny balíčků</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
-  <para>Balíčky byly rozřazeny do skupin, aby vám byl ulehčen výběr toho, co vše
-potřebujete ve vašem systému. Názvy skupin odpovídají tomu, co se v nich
-nachází, pokud však chcete vědět více o obsahu v dané skupině, stačí najet
-myší na název skupiny.</para>
+  <para>Packages are arranged into common groups, to make choosing what you need on
+your system a lot easier. The groups are fairly self explanatory, however
+more information about the content of each is available in tool-tips which
+become visible as the mouse is hovered over them.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Pracovní stanice.</para>
+      <para><emphasis role="bold">Workstation</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Server.</para>
+      <para><emphasis role="bold">Server</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Grafické prostředí.</para>
+      <para><emphasis role="bold">Graphical Environment</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Individuální výběr balíčků: Tuto možnost můžete použít pro ruční přidání
-nebo odebrání balíčků.</para>
+      <para><emphasis role="bold">Individual Package Selection</emphasis>: you can use
+this option to manually add or remove packages</para>
     </listitem>
   </itemizedlist>
 
-  <para>Přečtěte si <xref linkend="minimal-install"/> pro instrukce, jak provést
-minimální instalaci (bez nebo s X &amp; IceWM).</para>
+  <para>See <xref linkend="minimal-install"/> for instructions on how to do a
+minimal install (without or with X &amp; IceWM).</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/choosePackagesTree.xml b/docs/docs/stable/installer/cs/choosePackagesTree.xml
index d53c2eb8..c87aa365 100644
--- a/docs/docs/stable/installer/cs/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/cs/choosePackagesTree.xml
@@ -1,23 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="choosePackagesTree">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="cs">
+  <info>
+    <title xml:id="choosePackagesTree-ti1">Výběr jednotlivých balíčků</title>
+  </info>
 
-    <info>
-      <title xml:id="choosePackagesTree-ti1">Výběr jednotlivých balíčků</title>
-    </info>
+  
 
-    
+  
 
-<mediaobject>
-<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
-<imageobject> <imagedata fileref="dx2-choosePackagesTree.png" align="center"
-format="PNG" ></imagedata> </imageobject></mediaobject>
+  
 
-    <para>Zde můžete přidávat nebo odebírat všechny doplňkové balíčky pro přizpůsobení
-instalace.</para>
+  <mediaobject>
+<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
+align="center"/> </imageobject></mediaobject>
 
-    <para>Po učinění výběru můžete klepnout na <guibutton>ikonu diskety</guibutton> ve
-spodní části stránky pro uložení vašeho výběru balíčků (funguje i uložení na
-zařízení USB). Potom tento soubor můžete použít k nainstalování stejných
-balíčků na jiném systému, stisknutím stejného tlačítka během instalace a
-zvolením jeho nahrání.</para>
-  </section>
+  <para>Here you can add or remove any extra packages to customize your
+installation.</para>
 
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/configureServices.xml b/docs/docs/stable/installer/cs/configureServices.xml
index 15778744..5e740bc8 100644
--- a/docs/docs/stable/installer/cs/configureServices.xml
+++ b/docs/docs/stable/installer/cs/configureServices.xml
@@ -1,39 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="configureServices" version="5.0" xml:lang="cs">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="cs" xml:id="configureServices">
+  <info>
+    <title xml:id="configureServices-ti1">Nastavení služeb</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="configureServices-ti1">Nastavení služeb</title>
-    </info>
+  
 
-    
-   
+  
 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureServices.png"
-align="center" format="PNG" xml:id="configureServices-im1"></imagedata>
-</imageobject></mediaobject>
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
+xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
+  <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-    <para revision="1" xml:id="configureServices-pa1">Zde si můžete nastavit, jaké služby (ne)spouštět při zavádění systému.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-    <para revision="1" xml:id="configureServices-pa2">Jsou zde 4 skupiny. Klepnutím na šipku před skupinou danou skupinu rozbalíte
-a uvidíte služby, které obsahuje.</para>
-
-    <para revision="1" xml:id="configureServices-pa3">Nastavení, která DrakX vybral, jsou obyčejně dobrá.</para>
-
-    <para revision="1" xml:id="configureServices-pa4">Pokud zvýrazníte službu, některé informace o ní se ukážou v informačním poli
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Pokud zvýrazníte službu, některé informace o ní se ukážou v informačním poli
 níže.</para>
+    </listitem>
+  </itemizedlist>
 
-    <para revision="1" xml:id="configureServices-pa5">Věci měňte jen tehdy, když velmi dobře víte, co děláte.</para>
-  </section>
-
+  <para xml:id="configureServices-pa5" revision="1">Věci měňte jen tehdy, když velmi dobře víte, co děláte.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/configureTimezoneUTC.xml b/docs/docs/stable/installer/cs/configureTimezoneUTC.xml
index ab8cfa01..93e81d81 100644
--- a/docs/docs/stable/installer/cs/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/cs/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="configureTimezoneUTC">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="cs">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Nastavení časového pásma</title>
   </info>
@@ -7,20 +7,30 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject condition="classical"> <imagedata
-xml:id="configureTimezoneUTC-im1" revision="1"
-fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
-</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
-condition="live" format="PNG"/> </imageobject></mediaobject>
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="configureTimezoneUTC-im1" align="center"
+fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa1">Vyberte si časové pásmo výběrem vaší zememě nebo nejbližší město ve stejném
-časovém pásmu.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa2">V dalším okně si můžete vybrat nastavení hardwarových hodin na místní čas a
-GMT, také známý jako UTC.</para>
+  <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
+or to GMT, also known as UTC.</para>
 
   <note>
     <para revision="1" xml:id="configureTimezoneUTC-pa3">Pokud máte na vašem počítači více než jeden operační systém, ujistěte se, že
diff --git a/docs/docs/stable/installer/cs/configureX_card_list.xml b/docs/docs/stable/installer/cs/configureX_card_list.xml
index d1a481d3..ff96a8ee 100644
--- a/docs/docs/stable/installer/cs/configureX_card_list.xml
+++ b/docs/docs/stable/installer/cs/configureX_card_list.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="configureX_card_list">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
@@ -6,20 +13,28 @@
   
 
   
+
+  
+
+  
+
   
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Výběr X Serveru (Konfigurace vaší grafické karty)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-xml:id="configureX_card_list-im1" fileref="dx2-configureX_card_list.png"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX má velmi rozsáhlou databázi grafických karet a obvykle video zařízení
 identifikuje správně.</para>
@@ -27,33 +42,34 @@ identifikuje správně.</para>
   <para>Pokud není vaše grafická karta rozpoznána instalačním programem správně a
 víte, jakou kartu máte, můžete ji vybrat ze stromu: <itemizedlist>
       <listitem>
-        <para>dodavatel</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>pak název vaší karty</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>a typ vaší karty</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
-  <para>Pokud nemůžete najít svou kartu v seznamech dodavatelů (protože ještě není v
-databázi, nebo je to starší karta) můžete najít vhodný ovladač v kategorii
-Xorg</para>
-
-  <para>Seznam Xorg poskytuje více než 40 obecných a open source ovladačů grafických
-karet. Pokud stále nemůžete najít název ovladače pro kartu, existuje možnost
-použití VESA ovladač, který poskytuje základní možnosti.</para>
-
-  <para>Uvědomte si, že pokud vyberete nekompatibilní ovladač, můžete mít přístup
-pouze k rozhhraní příkazové řádky.</para>
+  <para>If you cannot find your card in the vendor lists (because it's not yet in
+the database or it's an older card) you may find a suitable driver in the
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Někteří výrobci grafických karet poskytují proprietární ovladače pro Linux,
-které mohou být k dispozici v nonfree úložišti a v některých případech jen
-pouze z webových stránek výrobce karety.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
-  <para>Přístup k Nonfree úložišti musí být výslovně povolen. Pokud tomu tak není,
-nejdříve jej povolte, toto byste měli udělat po prvním restartu.</para>
-</section>
\ No newline at end of file
+  <para>Some video card manufacturers provide proprietary drivers for Linux which
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/cs/configureX_chooser.xml b/docs/docs/stable/installer/cs/configureX_chooser.xml
index 67ca769c..99fef9c1 100644
--- a/docs/docs/stable/installer/cs/configureX_chooser.xml
+++ b/docs/docs/stable/installer/cs/configureX_chooser.xml
@@ -1,66 +1,92 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="cs">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Nastavení grafické karty a monitoru</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata revision="1" fileref="dx2-configureX_chooser.png"
-align="center" format="PNG" xml:id="configureX_chooser-im1"> </imagedata>
-</imageobject></mediaobject>
-
-  <para revision="1" xml:id="configureX_chooser-pa1">Bez ohledu na to, které grafické prostředí (známé i jako prostředí pracovní
-plochy) jste si vybrali pro tuto instalaci
-<application>Mageii</application>, všechna jsou založena na systému
-grafického uživatelského prostředí nazvanému <acronym>X Window
-Systém</acronym>, anebo jednoduše <acronym>X</acronym>. Takže k tomu, aby
-<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym>
-nebo kterékoli další grafické prostředí pracovalo správně, následující
-nastavení systému <acronym>X</acronym> musí být správná. Vyberte si správné
-nastavení, pokud vidíte, že <application>DrakX</application> neprovedl
-volbu, nebo pokud si myslíte, že volba je nesprávná.</para>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
+
+  <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis><guibutton>Grafická karta</guibutton></emphasis>: Vyberte ze
-seznamu vaši kartu, pokud je to třeba.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis><guibutton>Monitor</guibutton></emphasis>: Máte na výběr možnost
-<guilabel>Plug'n Play</guilabel>, pokud je použitelná, nebo si vybrat
-monitor v seznamu <guilabel>Dodavatelé</guilabel> nebo
-<guilabel>Všeobecné</guilabel> monitory. Vyberte
-<guilabel>Vlastní</guilabel>, pokud upřednostňujete ruční nastavení
-vodorovné a svislé obnovovací frekvence vašeho monitoru.</para>
-
-      <warning>
-        <para revision="1" xml:id="configureX_chooser-pa3a">Nesprávná obnovovací frekvence může poškodit váš monitor</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis><guibutton>Rozlišení</guibutton></emphasis>: Zde nastavte
-požadované rozlišení a barevnou hloubku monitoru.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis><guibutton>Zkouška</guibutton></emphasis>: Ne vždy se během
-instalace objeví testovací tlačítko. Pokud je tu toto tlačítko, můžete
-upravit nastavení jeho stisknutím. Pokud vidíte otázku ptající se vás, zda
-jsou vaše nastavení správná, můžete odpovědět "ano" a nastavení budou
-zachována. Pokud vůbec nic nevidíte, vraťte se na nastavovací obrazovku a
-budete moci přenastavit vše, dokud zkouška nedopadne
-dobře. <emphasis>Ujistěte se, že jsou vaše nastavení na bezpečné straně,
-pokud není testovací tlačítko dostupné.</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis><guibutton>Možnosti</guibutton></emphasis>: Zde si můžete vybrat
-zda povolit nebo zakázat různé další možnosti.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
 </section>
diff --git a/docs/docs/stable/installer/cs/configureX_monitor.xml b/docs/docs/stable/installer/cs/configureX_monitor.xml
index 58be4212..3f902299 100644
--- a/docs/docs/stable/installer/cs/configureX_monitor.xml
+++ b/docs/docs/stable/installer/cs/configureX_monitor.xml
@@ -14,11 +14,17 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
-<!-- lproof -->
+<!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Výběr monitoru</title>
   </info>
 
@@ -26,58 +32,73 @@
 váš.</para>
 
   <warning>
-    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis>Vybrání monitoru s odlišnými charakteristikami může poškodit váš
-monitor nebo vybavení pro video. Nezkoušejte, prosím, nic bez toho, že byste
-nevěděl, co děláte.</emphasis> Pokud máte pochybnost, měl byste nahlédnout
-do dokumentace k vašemu monitoru.</para>
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
+could damage your monitor or video hardware. Please don't try something
+without knowing what you are doing.</emphasis> If in doubt you should
+consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
 format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa2"><emphasis>Vlastní</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Tato volba vám dovoluje nastavit dva kritické parametry, svislou obnovovací
-frekvenci a vodorovnou synchronizační frekvenci. Vertikální obnovování
-určuje, jak často je obrazovka obnovována a horizontální synchronizace je
-rychlost, kterou jsou zobrazovány skenované řádky.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">Je <emphasis>VELMI DŮLEŽITÉ</emphasis> abyste nezvolili typ monitoru s
+        <para revision="1" xml:id="configureX_monitor-pa4">Je <emphasis>VELMI DŮLEŽITÉ</emphasis> abyste nezvolili typ monitoru s
 rozsahem synchronizace, který přesahuje schopnosti vašeho monitoru: mohli
 byste tím poškodit svůj monitor. Pokud jste na pochybách, vyberte si
 konzervativní nastavení a prověřte ho v dokumentaci k vašemu monitoru.</para>
+      </listitem>
+    </varlistentry>
 
-  <para revision="1" xml:id="configureX_monitor-pa5"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para revision="1" xml:id="configureX_monitor-pa6">Toto je výchozí volba a snaží se určit typ monitoru z databáze monitorů.</para>
-
-  <para revision="1"
-  xml:id="configureX_monitor-pa7"><emphasis>Dodavatel</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa8">Pokud instalátor správně nerozpoznal váš monitor a vy víte, který máte,
-můžete si ho zvolit ze stromu pomocí výběru: <itemizedlist>
       <listitem>
-        <para>dodavatel</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>název výrobce monitoru</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>popis monitoru</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Pokud instalátor správně nerozpoznal váš monitor a vy víte, který máte,
+můžete si ho zvolit ze stromu pomocí výběru:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa9"><emphasis>Všeobecný</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para revision="1" xml:id="configureX_monitor-pa10">výběr této skupiny zobrazí přibližně 30 nastavení obrazovky, jako jsou
-1024x768 @ 60Hz zahrnuje i ploché panelové obrazovky, jaké jsou používány ve
-přenosných počítačích. Toto bývá často dobrou skupinou pro výběr monitoru,
-pokud potřebujete používat ovladač karty Vesa, když váš obrazový hardware
-nemůže být rozpoznán automaticky. I tady může být rozumné být při svém
-výběru konzervativní.</para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 </section>
diff --git a/docs/docs/stable/installer/cs/diskPartitioning.xml b/docs/docs/stable/installer/cs/diskPartitioning.xml
new file mode 100644
index 00000000..433f9c2e
--- /dev/null
+++ b/docs/docs/stable/installer/cs/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="cs" version="5.0" xml:lang="cs">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/diskdrake.xml b/docs/docs/stable/installer/cs/diskdrake.xml
index e095e832..4ae11a80 100644
--- a/docs/docs/stable/installer/cs/diskdrake.xml
+++ b/docs/docs/stable/installer/cs/diskdrake.xml
@@ -1,49 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" 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" version="5.0" xml:lang="cs" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Vlastní rozdělení disku pomocí DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
+
   <warning>
-    <para revision="3" xml:id="diskdrake-pa1">Pokud si přejete použít šifrování na vašem <literal>/</literal> oddílu,
-musíte se ujistit, že máte samostatný  oddíl <literal>/boot</literal>. Volba
-pro zašifrování NESMÍ být nastavena pro zaváděcí oddíl
-<literal>/boot</literal>, jinak váš systém nebude možné zavést.</para>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
   </warning>
-  <para xml:id="diskdrake-pa3" revision="2">Zde upravíte rozložení disku (disků). Můžete odstraňovat nebo vytvářet
-oddíly, měnit souborový systém oddílu, anebo měnit jeho velikost a dokonce
-se podívat, co je na něm, předtím než začnete.</para>
-  <para xml:id="diskdrake-pa4" revision="1">Je tam karta pro každý nalezený pevný disk nebo jiné úložné zařízení, jako
-je zařízení USB. Například sda, sdb a sdc, pokud jsou připojena tři. </para>
-  <para xml:id="diskdrake-pa5" revision="1">Stiskněte <guibutton>Vyčistit vše</guibutton> pro smazání všech oddílů na
-vybraném úložném zařízení.</para>
-  <para xml:id="diskdrake-pa6" revision="1">Pro všechky ostatní činnosti: klepněte nejprve na požadovaný oddíl. Potom si
-jej prohlédněte, nebo si vyberte souborový systém a přípojný bod, změňte
-jeho velikost nebo jej vymažte. <guibutton>Přepnout do expertního
-režimu</guibutton> (nebo <guibutton>Expertní režim</guibutton>) dodá některé
-další nástroje jako je přidání štítku nebo vybrání typu oddílu. </para>
-  <para xml:id="diskdrake-pa6a" revision="1">Pokračujte dokud jste nenastavil vše podle vašeho přání.</para>
-  <para xml:id="diskdrake-pa7" revision="1">Klepněte na tlačítko <guibutton>Hotovo</guibutton>, když jste připraven.</para>
-  <note>
-    <para>Pokud instalujete Mageiu na UEFI systému, zkontrolujte zda ESP (EFI System
-Partition) existuje a je připojen v /boot/EFI (více níže)</para>
-    <para><mediaobject><imageobject condition="classical"><imagedata fileref="dx2-diskdrake2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-align="center" fileref="live-diskdrake2.png"/></imageobject></mediaobject></para>
-  </note>
-  <note>
-    <para>Pokud instalujete Mageiu na systém Legacy/GPT, zkontrolujte, že je přítomen
-zaváděcí oddíl BIOS a že je správného typu</para>
-    <mediaobject>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
+
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
+
+  <figure>
+    <title>EFI System Partition</title>
+
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
+
+  <figure>
+    <title>BIOS boot partition</title>
+
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/cs/doPartitionDisks.xml b/docs/docs/stable/installer/cs/doPartitionDisks.xml
index 23557af4..e05a4997 100644
--- a/docs/docs/stable/installer/cs/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/cs/doPartitionDisks.xml
@@ -1,78 +1,213 @@
-<?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:lang="cs" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+
   
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
 
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Rozdělení disku</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
-  <para xml:id="doPartitionDisks-pa1" revision="1">V této obrazovce můžete vidět obsah vašeho pevného disku (disků) a vidět
-nalezená řešení průvodce DrakX rozdělováním disku navrhujícího, kam
-nainstalovat <application>Mageiu</application>.</para>
-  <para xml:id="doPartitionDisks-pa2" revision="1">Volby dostupné z níže uvedeného seznamu se budou lišit v závislosti na
-rozložení a obsahu vašeho konkrétního pevného disku.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist><listitem><para revision="1" xml:id="doPartitionDisks-pa4">Použít existující oddíly</para><para xml:id="doPartitionDisks-pa5" revision="1">Pokud je dostupná tato volba, potom byly nalezeny stávající s Linuxem
-kompatibilní oddíly a tyto mohou být použity pro instalaci.</para></listitem><listitem><para xml:id="doPartitionDisks-pa6" revision="1">Použít volné místo</para><para xml:id="doPartitionDisks-pa7" revision="1">Pokud máte nevyužité místo na vašem pevném disku, potom ho tato volba
-využije pro novou instalaci Mageii.</para></listitem><listitem><para xml:id="doPartitionDisks-pa8" revision="1">Použít volné místo na oddílu Windows</para><para xml:id="doPartitionDisks-pa9" revision="1">Pokud máte nevyužité místo na stávajícím windowsovském oddíle, instalátor
-může nabídnout jeho použití.</para><para xml:id="doPartitionDisks-pa10" revision="2">Toto může být užitečná cesta vytvoření prostoru pro vaši novou instalaci
-Mageii, ale je to riziková operace, takže byste se měli ujistit, že máte
-zazálohovány všechny důležité soubory!</para><para revision="3" xml:id="doPartitionDisks-pa11">Pamatujte, že toto znamená zmenšení velikosti windowsovského oddílu. Oddíl
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa5">Pokud je dostupná tato volba, potom byly nalezeny stávající s Linuxem
+kompatibilní oddíly a tyto mohou být použity pro instalaci.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa7">Pokud máte nevyužité místo na vašem pevném disku, potom ho tato volba
+využije pro novou instalaci Mageii.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
+
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
+
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">Pamatujte, že toto znamená zmenšení velikosti windowsovského oddílu. Oddíl
 musí být "čistý", to znamená, že Windows musely být správně vypnuty, když
 byly naposledy použity. Též musely být defragmentovány, ačkoli toto není
 zárukou, že všechny soubory na oddíle byly přesunuty z oblasti, která má být
-použita. Velice se doporučuje provedení zálohy vašich osobních souborů.</para><para>U této volby instalátor zobrazí zůstávající windowsovský oddíl v světlemodré
-a budoucí oddíl Mageii v tmavomodré barvě spolu s jejich zamýšlenými
-velikostmi pod nimi. Máte možnost přizpůsobit tyto velikosti klepnutím a
-přesunutím mezery mezi oběma oddíly. Viz snímek obrazovky níže.</para><mediaobject><imageobject condition="classical"><imagedata
-fileref="dx2-doPartitionDisks2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-fileref="live-doPartitionDisks2.png" align="center"/></imageobject></mediaobject></listitem></itemizedlist> <itemizedlist><listitem><para xml:id="doPartitionDisks-pa12" revision="1">Smazat a použít celý disk</para><para xml:id="doPartitionDisks-pa13" revision="1">Tato volba použije celé diskové zařízení pro Mageiu.</para><para xml:id="doPartitionDisks-pa14" revision="1">Pozor, toto smaže všechna data na vybraném disku. Buďte opatrní!</para><para xml:id="doPartitionDisks-pa15" revision="1">Pokud zamýšlíte použít část disku na něco jiného, nebo už máte data na onom
-disku, která nejste připraveni ztratit, potom tuto volbu nepoužívejte.</para></listitem></itemizedlist><itemizedlist><listitem><para xml:id="doPartitionDisks-pa16" revision="1">Vlastní rozdělení disku</para><para xml:id="doPartitionDisks-pa17" revision="1">Toto vám dává úplnou kontrolu nad umístěním instalace na vašem pevném disku
-(resp. discích).</para></listitem></itemizedlist></para>
-  <para><emphasis role="bold">Měnění velikostí oddílu:</emphasis></para>
-  <para>Instalátor rozdělí dostupné místo podle následujících pravidel:</para>
-  <para><itemizedlist><listitem><para>Pokud je celkové dostupné místo menší než 50 GB, bude vytvořen jen jeden
-oddíl pro /, nebude tu žádný samostatný oddíl pro /home.</para></listitem><listitem><para>Pokud je celkové dostupné místo nad 50 GB, potom se vytvoří tři oddíly</para><itemizedlist><listitem><para>6/19 z celkového dostupného místa je přideleno pro / , nanejvýš však 50 GB</para></listitem><listitem><para>1/19 je přiděleno pro swap , nanejvýš však 4 GB</para></listitem><listitem><para>zbytek (přinejmenším 12/19) je přiděleno pro /home</para></listitem></itemizedlist></listitem></itemizedlist></para>
-  <para>To znamená, že v případě 160 GB a víc z dostupného místa, instalátor vytvoří
-tři oddíly: 50 GB pro /, 4 GB pro swap a zbytek pro adresář /home.</para>
+použita. Velice se doporučuje provedení zálohy vašich osobních souborů.</para>
+      </important>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa17">Toto vám dává úplnou kontrolu nad umístěním instalace na vašem pevném disku
+(resp. discích).</para>
+    </listitem>
+  </itemizedlist>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
+
   <note>
-    <para>Pokud používáte systém UEFI, ESP (systémový oddíl EFI) bude automaticky
-rozpoznán, nebo vytvořen, pokud ještě neexistuje, a připojen na
-/boot/EFI. Volba "Vlastní rozdělení disku" je jediná, která vám dovoluje
-zkontrolovat, že toto bylo provedeno správně.</para>
+    <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
-  <note>
-    <para>If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk,
-you need to create a Bios boot partition if not already existing. It is an
-about 1 MiB partition with no mount point. Choose <xref
-linkend="diskdrake"/> to be able to create it with the Installer like any
-other partition, just select BIOS boot partition as filesystem type.</para>
-    <mediaobject>
+
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
-  <warning>
-    <para>Některé novější mechaniky nyní používají 4096 bajtové logické sektory,
-namísto předchozího standardu 512 bajtových logických sektorů. Nástroj na
-dělení disku použitý v instalátoru nebyl kvůli nedostatku dostupného
-hardware testován s takovou mechanikou. Taktéž některé mechaniky ssd dnes
-používají velikost vymazávacího bloku nad 1 MB. Navrhuje se napřed rozdělit
-mechaniku, s použitím alternativních nástrojů na rozdělování disku, jakým je
-gparted, pokud vlastníte takové zařízení, a použít následující nastavení:</para>
-    <para>"Zarovnat na" "MiB"</para>
-    <para>"Předcházející volné místo (MiB)" "2"</para>
-    <para>Též se ujistěte, že všechny oddíly jsou vytvořeny se sudým počtem megabajtů.</para>
-  </warning>
-</section>
\ No newline at end of file
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
+
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+
+  <important>
+    <para>Some newer drives are now using 4096 byte logical sectors, instead of the
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Also make sure all partitions are created using an even number of megabytes.</para>
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/cs/exitInstall.xml b/docs/docs/stable/installer/cs/exitInstall.xml
index 8f403acd..757a7a7d 100644
--- a/docs/docs/stable/installer/cs/exitInstall.xml
+++ b/docs/docs/stable/installer/cs/exitInstall.xml
@@ -1,19 +1,32 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xml:id="exitInstall" version="5.0" xml:lang="cs">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0" xml:lang="cs">
   <info>
     <title xml:id="exitInstall-ti1">Gratulujeme</title>
   </info>
+
   
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
-  <para xml:id="exitInstall-pa1" revision="2">Dokončili jste instalaci a nastavení <application>Mageii</application> a teď
-je bezpečné vyjmout instalační médium a restartovat počítač.</para>
-  <para xml:id="exitInstall-pa2" revision="2">Po restartu, na obrazovce zavaděče, si můžete vybrat mezi operačními systémy
-ve vašem počítači (pokud jich máte víc než jeden).</para>
+
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
+
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
+
   <para xml:id="exitInstall-pa3" revision="1">Pokud jste neupravovali nastavení pro zavaděč systému, automaticky bude
 vybrána a spuštěna vaše nainstalovaná Mageia.</para>
+
   <para xml:id="exitInstall-pa4" revision="1">Bavte se!</para>
-  <para xml:id="exitInstall-pa5" revision="1">Navštivte www.mageia.org, pokud máte nějaké otázky nebo pokud chcete přispět
-do Mageii</para>
+
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/firewall.xml b/docs/docs/stable/installer/cs/firewall.xml
index 28b10b53..05903bb5 100644
--- a/docs/docs/stable/installer/cs/firewall.xml
+++ b/docs/docs/stable/installer/cs/firewall.xml
@@ -1,33 +1,37 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="cs">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="cs" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Firewall</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Firewall</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows to configure some simple firewall rules: they determine
-which type of message from the Internet will be accepted by the target
-system. This, in turn, allows the corresponding services on the system to be
-accessible from the Internet.</para>
+  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+determine which type of message from the Internet will be accepted by the
+target system. This, in turn, allows the corresponding services on the
+system to be accessible from the Internet.</para>
 
-  <para>In the default setting, no button is checked - no service of the system is
-accessibly from the network. The "<emphasis>Everything (no
-firewall)</emphasis>" button has a particular role: it enables access to all
-services of the machine - an option that does not make much sense in the
-context of the installer since it would create a totally unprotected
-system.  Its veritable use is in the context of the Mageia Control Center
-(which uses the same GUI layout) for temporarily disabling the entire set of
-firewall rules for testing and debugging purposes.</para>
+  <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
 
-  <para>All other checkbuttons are more or less self-explanatory. As an example, you
-will check the "CUPS server" button if you want printers on your machine to
-be accessible from the network.</para>
+  <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Pokročilé</emphasis></para>
 
-  <para>The set of checkbuttons only comprises the most common services. The
-"Advanced" button allows to enable messages that correspond to a service for
-which no checkbutton exists. The "<emphasis>Advanced</emphasis>" button
-opens a window where you can enable a series of services by typing a list of
-couples (blank separated)</para>
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
 
diff --git a/docs/docs/stable/installer/cs/formatPartitions.xml b/docs/docs/stable/installer/cs/formatPartitions.xml
index d25071f5..8976c305 100644
--- a/docs/docs/stable/installer/cs/formatPartitions.xml
+++ b/docs/docs/stable/installer/cs/formatPartitions.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="formatPartitions">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formátování</title>
   </info>
@@ -7,43 +13,41 @@
   
 
   
+
   
+
   
+
   
-  
-  
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-formatPartitions.png" format="PNG" align="center"
-xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-formatPartitions.png" format="PNG" align="center"
-xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="formatPartitions-pa1">Zde si můžete vybrat, který oddíl (nebo oddíly) si přejete
-naformátovat. Všechna data na oddílech <emphasis>neoznačených</emphasis> pro
-naformátování budou ušetřena.</para>
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
+partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa2">Obyčejně potřebují být naformátovány přinejmenším oddíly, které DrakX
-vybral.</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa3">Klepněte na <guibutton>Pokročilé</guibutton> pro výběr oddílů, které chcete
-zkontrolovat na takzvané <emphasis>chybné bloky</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para revision="1" xml:id="formatPartitions-pa4">Pokud si nejste jistí, zda jste vykonali správnou volbu, můžete klepnout na
-tlačítko <guibutton>Předchozí</guibutton>, opět na
-<guibutton>Předchozí</guibutton> a potom na <guibutton>Vlastní</guibutton>,
-abyste se vrátili na hlavní obrazovku. Na této obrazovce si můžete vybrat
-pohled na to, co máte na vašich oddílech.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para revision="1" xml:id="formatPartitions-pa5">Pokud jste spokojen s výběrem, klepněte na <guibutton>Další</guibutton> pro
-pokračování.</para>
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
 </section>
diff --git a/docs/docs/stable/installer/cs/graphicalConfiguration.xml b/docs/docs/stable/installer/cs/graphicalConfiguration.xml
new file mode 100644
index 00000000..fde88d84
--- /dev/null
+++ b/docs/docs/stable/installer/cs/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/cs/installUpdates.xml b/docs/docs/stable/installer/cs/installUpdates.xml
index fb3f26a3..d773f1b1 100644
--- a/docs/docs/stable/installer/cs/installUpdates.xml
+++ b/docs/docs/stable/installer/cs/installUpdates.xml
@@ -1,32 +1,46 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="cs">
+  
 
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="installUpdates"><info><title xml:id="installUpdates-ti1">Aktualizace</title></info>
+  
 
+  
 
+  
 
+  
 
- 
- 
- 
+  
 
-   <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-installUpdates.png"
-format="PNG" align="center" xml:id="installUpdates-im1"></imagedata>
-</imageobject></mediaobject> 
-
- <para revision="1" xml:id="installUpdates-pa1">Od té doby, co byla uvolněna tato verze operačního systému
-<application>Mageia</application>, byly některé balíčky aktualizovány nebo
-vylepšeny.</para>
-
-  <para revision="1" xml:id="installUpdates-pa2">Zvolte <guilabel>ano</guilabel>, pokud si je přejete stáhnout a
-nainstalovat, vyberte <guilabel>ne</guilabel>, pokud to teď nechcete udělat,
-nebo pokud nejste připojeni k internetu.</para>
-
-  <para revision="1" xml:id="installUpdates-pa3">Potom stiskněte <guibutton>Další</guibutton> pro pokračování</para>
-
-</section>
-  
\ No newline at end of file
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Aktualizace</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
+align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+    </listitem>
+
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/installer.xml b/docs/docs/stable/installer/cs/installer.xml
index 26fa1df4..9c3dcb26 100644
--- a/docs/docs/stable/installer/cs/installer.xml
+++ b/docs/docs/stable/installer/cs/installer.xml
@@ -1,166 +1,169 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="installer">
-  <info>
-    <title xml:id="Select-and-use-ISOs-ti1">DrakX, instalátor Mageii</title>
-  </info>
-
-  <para>Ať už jste v GNU-Linux začátečník nebo zkušený uživatel, instalátor Mageii
-je navržen tak, aby instalace nebo aktualizace byla tak jednoduchá, jak jen
-je to možné.</para>
-
-  <para>Počáteční nabídková obrazovka má různé možnosti, každopádně předvolená
-spustí instalátor, který bude obyčejně mít vše, co potřebujete.</para>
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="installer"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
 
-  <section>
-    <title>Uvítací instalační obrazovka</title>
+  
 
-    <section>
-      <title>Použití DVD Mageia</title>
+  
 
-      <para>Zde jsou výchozí uvítací obrazovky při používaní DVD Mageia. První je se
-systémem UEFI a druhá se zastaralým systémem:</para>
+  
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, you can access to options by pressing the "e" letter to
-enter the "edit mode". To come back to this screen, press either the key
-"esc" to quit without saving or press the key "Ctrl" or "F10" to quit with
-saving.</para>
-
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
+  
 
-      <para>Na této obrazovce je možné nastavit některá osobní nastavení:<itemizedlist>
-          <listitem>
-            <para>Jazyk (jen pro instalaci, může se odlišovat od zvoleného systémového jazyka)
-stisknutím klávesy F2 (jen v zastaralém režimu)</para>
+  
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
+  
 
-            <para>Použijte šipkové klávesy pro výběr jazyka a stiskněte klávesu Enter.</para>
+  
 
-            <para>Zde je například francouzská uvítací obrazovka, když používáte živé
-DVD/CD. Pamatujte si, že nabídka na Live DVD/CD nepředkládá:
-<guilabel>Záchranný systém</guilabel>, <guilabel>Paměťový test</guilabel> a
-<guilabel>Nástroj na zjištění vybavení počítače</guilabel>.</para>
+  
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome4fr.png"/> </imageobject></mediaobject>
-          </listitem>
+  
 
-          <listitem>
-            <para>Změňte rozlišení obrazovky stisknutím klávesy F3 (jen v zastaralém režimu).</para>
+  <info>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, instalátor Mageii</title>
+  </info>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
+  <para>Ať už jste v GNU-Linux začátečník nebo zkušený uživatel, instalátor Mageii
+je navržen tak, aby instalace nebo aktualizace byla tak jednoduchá, jak jen
+je to možné.</para>
 
-          <listitem>
-            <para>Přidejte některé volby pro kernel stisknutím klávesy <emphasis
-role="bold">F6</emphasis> v zastaralém režimu nebo klávesy <emphasis
-role="bold">e</emphasis> v režimu UEFI.</para>
+  <section>
+    <title>Instalační kroky</title>
 
-            <para>Pokud instalace selhává, tehdy může být nutné vyzkoušet znovu jednu z
-možností navíc. Nabídka vyvolaná přes F6 zobrazuje nový řádek nazvaný
-<guilabel>Volby pro zavedení</guilabel> a nabízí čtyři položky:</para>
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
-            <para>- Výchozí, tato nemění nic ve výchozích volbách.</para>
+  <section>
+    <title>Uvítací instalační obrazovka</title>
 
-            <para>- Výchozí, tato nemění nic ve výchozích volbách.</para>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-            <para>- Žádné ACPI (pokročilé rozhraní nastavení a napájení), správa napájení není
-brána do úvahy.</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
 
-            <para>- Žádný místní APIC (lokální pokročilý programovatelný ovladač přerušení),
-jedná se o přerušení CPU, vyberte tuto volbu, pokud jste k tomu vyzváni.</para>
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
-            <para>Když si vyberete jednu z těchto položek, tato změní výchozí volby zobrazené
-v řádku <guilabel>Volby zavádění systému</guilabel>.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-            <note>
-              <para>V některých vydáních Mageii se může stát, že se položky vybrané klávesou F6
-neobjevují v řádku <guilabel>Volby zavádění systému</guilabel>, avšak ve
-skutečnosti jsou brány do úvahy.</para>
-            </note>
+      <itemizedlist>
+        <title>Menu</title>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
 
-          <listitem>
-            <para>Přidejte více voleb pro kernel stisknutím klávesy F1 (jen v zastaralém
-režimu).</para>
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
 
-            <para>Stisknutí klávesy F1 otevře nové okno s dalšími dostupnými volbami. Vyberte
-jednu šipkovými klávesami a stiskněte klávesu Enter pro obdržení více
-podrobností nebo stiskněte klávesu Esc pro návrat na uvítací obrazovku.</para>
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
 
-            <para>Podrobný přehled o rozsahu voleb. Stiskněte Esc nebo zvolte <guilabel>návrat
-k parametrům spuštění</guilabel> pro návrat zpět do seznamu voleb. Tyto
-volby mohou být přidány ručně v řádku <guilabel>Volby zavádění
-systému</guilabel>.</para>
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
 
-            <note>
-              <para>Nápověda je přeložena ve zvoleném jazyku pomocí klávesy F2.</para>
-            </note>
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
 
-            <para>Pro více informací o volbách pro kernel na zastaralých systémech a systémech
-UEFI se podívejte na: <link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
 
     <section>
-      <title>Použití drátové sítě</title>
+      <title>UEFI Systems</title>
 
-      <para>Zde je výchozí uvítací obrazovka při používání instalačního CD založeného na
-připojení k drátové síti (obrazy netinstall.iso nebo
-netinstall-nonfree.iso):</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-      <para>Nedovoluje změnit jazyk, dostupné možnosti jsou popsány na obrazovce. Pro
-více informací o používaní instalačního CD založeného na připojení k síti se
-podívejte na <link
-ns2:href="https://wiki.mageia.org/en/Boot.iso_install">Mageia Wiki</link></para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-      <warning>
-        <para>Rozložení klávesnice je americké.</para>
-      </warning>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="../dx-help.png"/> </imageobject></mediaobject>
-    </section>
-  </section>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
 
-  <section>
-    <title>Instalační kroky</title>
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
 
-    <para>Proces instalace je rozdělen do více kroků, které je možné sledovat na
-bočním panelu obrazovky.</para>
-
-    <para>Každý krok má jednu nebo více obrazovek, které též můžou mít tlačítka
-<guibutton>Pokročilé</guibutton> s obyčejně méně žádanými možnostmi navíc.</para>
-
-    <para>Většina obrazovek má tlačítka <guibutton>Nápověda</guibutton>, která dávají
-bližší vysvětlení aktuálního kroku.</para>
-
-    <note>
-      <para>Pokud se někde během instalace rozhodnete instalaci ukončit, je možný
-restart, ale promyslete si to, prosím, dvakrát, dříve než to uděláte. Když
-už byl oddíl jednou naformátován nebo se začaly instalovat aktualizace, váš
-počítač už nadále není ve stejném stavu a jeho opětovné spuštění by vás
-mohlo celkem snadno nechat s nepoužitelným systémem. Pokud jste si přesto
-velmi jistí, že chcete provést restart, jděte do textového terminálu za
-současného stisknutí tří kláves <guibutton>Alt+Ctrl+F2</guibutton>. Potom
-současně stiskněte <guibutton>Alt+Ctrl+Delete</guibutton> pro restart.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -171,17 +174,20 @@ současně stiskněte <guibutton>Alt+Ctrl+Delete</guibutton> pro restart.</para>
 
       <itemizedlist>
         <listitem>
-          <para>Po počáteční obrazovce vám nenaběhla obrazovka výběru jazyka. Toto se může
-stát s některými grafickými kartami a staršími systémy. Zkuste použít nízké
-rozlišení obrazovky napsáním <code>vgalo</code> v příkazovém řádku.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
-          <para>Pokud je vybavení počítače velmi staré, grafická instalace nemusí být
-možná. V tomto případě se oplatí vyzkoušet instalaci v textovém režimu. Pro
-její použití stiskněte ESC na první uvítací obrazovce a potvrďte klávesou
-ENTER. Bude vám nabídnuta černá obrazovka se slovem "boot". Napište "text" a
-stiskněte ENTER. Nyní pokračujte instalací v textovém režimu.</para>
+          <para>If the hardware is very old, a graphical installation may not be
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -189,32 +195,31 @@ stiskněte ENTER. Nyní pokračujte instalací v textovém režimu.</para>
     <section>
       <title>Instalace zamrzne</title>
 
-      <para>Pokud sa zdá, že systém během instalace zamrzává, může to být problém se
-zjišťováním vybavení počítače součástkami. V tomto případě může být
-automatické zjišťování hardware obejito a vykonáno později. Pokud toto
-chcete vyzkoušet, napište <code>noauto</code> v příkazovém řádku. Tato volba
-může být, když je třeba, též spojena i s jinými volbami.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
       <title>Problém paměti RAM</title>
 
-      <para>Toto bude potřebné zřídka, ale v některých případech může hardware nesprávně
-ohlásit dostupnou paměť RAM. Abyste ji zadali ručně, můžete použít parametr
-<code>mem=xxxM</code>, kde xxx je správné množství paměti RAM,
-např. <code>mem=256M</code> by znamenalo 256 MB RAM.</para>
+      <para>This will rarely be needed, but in some cases the hardware may report the
+available RAM incorrectly. To specify this manually, you can use the
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dynamické oddíly</title>
 
-      <para>Pokud jste váš pevný disk převedli ze "základního" formátu na "dynamický"
-formát v systému Microsoft Windows, musíte vědět, že je nemožné instalovat
-Mageiu na tento disk. Pro návrat zpět k základnímu disku se podívejte na
-dokumentaci Microsoftu: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
-
-  <section/>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/cs/locale.xml b/docs/docs/stable/installer/cs/locale.xml
new file mode 100644
index 00000000..1a4afca8
--- /dev/null
+++ b/docs/docs/stable/installer/cs/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/cs/login.xml b/docs/docs/stable/installer/cs/login.xml
index 45ed736b..5bf6c96d 100644
--- a/docs/docs/stable/installer/cs/login.xml
+++ b/docs/docs/stable/installer/cs/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="cs"><info><title xml:id="label-to-adapt-ti1">Přihlašovací obrazovka</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>Přihlašovací obrazovka KDM</para></caption></mediaobject><para>Nakonec se dostanete k přihlašovací obrazovce</para><para>Vložte své uživatelské jméno a uživatelské heslo a za pár sekund se, podle
-toho který živý datový nosič jste použili, ocitnete v nahraném prostředí KDE
-nebo GNOME. Nyní můžete začít používat vaši instalaci Mageii.</para><para>Další část naší dokumentace můžete najít na <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">Mageia
-wiki</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="cs">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/media_selection.xml b/docs/docs/stable/installer/cs/media_selection.xml
index b698026b..2517fd04 100644
--- a/docs/docs/stable/installer/cs/media_selection.xml
+++ b/docs/docs/stable/installer/cs/media_selection.xml
@@ -1,18 +1,31 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="cs">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Výběr zdrojů (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
+
   
+
   
+
   
 
-<mediaobject>
+  
+  
+  <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
 <imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
 format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
@@ -27,21 +40,19 @@ základ distribuce.</para>
     </listitem>
 
     <listitem>
-      <para>Repozitář pro <emphasis>Nonfree</emphasis> software obsahuje balíčky, které
-jsou volně bez poplatků, to znamená, že Mageia je může redistribuovat, ale
-ony obsahují software s neveřejným zdrojovým kódem (odtud pochází
-pojmenování Nonfree - nesvobodný). Například tento repozitář obsahuje
-soukromé ovladače pro grafické karty nVidia a ATI, firmware pro různé karty
-WiFi atd.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
-      <para>Repozitář pro <emphasis>Tainted</emphasis>, moravsky tedy poznamenaný
-software, obsahuje balíčky uvolněné pod svobodnou licencí. Hlavním hlediskem
-pro umístění balíčků do tohoto repozitáře je to, že v některých zemích mohou
-porušovat patenty a autorské zákony, např. multimediální kodeky potřebné na
-přehrávání rozličných audio/video souborů; balíčky potřebné na přehrávání
-komerčních video DVD, atd.</para>
+      <para>The <emphasis>Tainted</emphasis> repository includes packages released under
+a free license. The main criteria for placing packages in this repository is
+that they may infringe patents and copyright laws in some countries,
+e.g. multimedia codecs needed to play various audio/video files; packages
+needed to play commercial video DVD's, etc.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/cs/minimal-install.xml b/docs/docs/stable/installer/cs/minimal-install.xml
index 4534cbf0..0897da18 100644
--- a/docs/docs/stable/installer/cs/minimal-install.xml
+++ b/docs/docs/stable/installer/cs/minimal-install.xml
@@ -1,48 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="cs" xml:id="minimal-install"
-         xmlns="http://docbook.org/ns/docbook"
-	 xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="cs">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Minimální instalace</title>
   </info>
 
   
+
   
 
-  <para>Můžete si zvolit Minimální instalaci odznačením všeho na obrazovce Výběru
-skupin balíčků. Podívejte se na <xref linkend="choosePackageGroups"></xref>.</para>
-  <para>Pokud je žádána, můžete na téže obrazovce dodatečně zaškrtnout volbu pro
-"výběr jednotlivých balíčků".</para>
-  <para>Minimální instalace je zamýšlena pro ty, kteří zamýšlejí zvláštní využití
-své <application>Mageii</application>, jakým je server nebo specializovaná
-pracovní stanice. Tuto volbu pravděpodobně použijete spojenu s možností
-"výběru jednotlivých balíčků" vzpomenutou výše, k doladění vaší
-instalace. Podívejte se na <xref linkend="choosePackagesTree"></xref>.</para>
-  <para>Pokud jste si zvolili tuto instalační třídu, potom vám příslušná obrazovka
-nabídne několik užitečných věcí navíc k nainstalování, jakými jsou
-dokumentace a X server.</para>
-  <para>Pokud je vybráno, tehdy je "Spolu s X" zahrnuto i IceWM jako lehké pracovní
-prostředí.</para>
-  <para>Základní dokumentace je poskytnuta v podobě manuálových a informačních
-stránek. Obsahuje manuálové stránky z <link
-xlink:href="http://www.tldp.org/manpages/man.html">Linuxového dokumentačního
-projektu</link> a informační stránky o <link
-xlink:href="http://www.gnu.org/software/coreutils/manual/">jádrových
-programech GNU</link>.</para>
+  
 
-  <mediaobject>
-<imageobject> <imagedata revision="1" fileref="dx2-minimal-install.png"
-align="center" format="PNG" xml:id="minimal-install-im1"></imagedata>
-</imageobject></mediaobject>
+  
+
+  
 
-  </section>
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
 
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
+xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
+Project</link> and the <link
+xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
+coreutils</link> info pages.</para>
+
+  <mediaobject>
+<imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
+align="center" fileref="dx2-minimal-install.png" revision="1"/>
+</imageobject></mediaobject>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/misc-params.xml b/docs/docs/stable/installer/cs/misc-params.xml
index 3e1f6ccf..93acbe36 100644
--- a/docs/docs/stable/installer/cs/misc-params.xml
+++ b/docs/docs/stable/installer/cs/misc-params.xml
@@ -1,22 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Souhrn různých parametrů</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
-
-  <para xml:id="misc-params-pa1" revision="1">DrakX udělal chytré volby pro nastavení vašeho systému závisící na volbách,
-které jste udělal a na vybavení počítače, které DrakX zjistil. Nastavení
-můžete zhodnotit zde a změnit je, jak chcete, po stisknutí
-<guibutton>Nastavit</guibutton>.</para>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+  <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
 
   <note>
-    <para>As a general rule, default settings are recommended and you can keep them
-with 3 exceptions:<itemizedlist>
+    <para>As a general rule, it is recommended that you accept the default settings
+unless:<itemizedlist>
         <listitem>
           <para>existují známé problémy s výchozím nastavením</para>
         </listitem>
@@ -26,7 +42,7 @@ with 3 exceptions:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>something else is said in the detailed sections below</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,48 +54,47 @@ with 3 exceptions:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Časové pásmo</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX pro vás vybral časové pásmo, vzhledem k vašemu oblíbenému
-jazyku. Můžete je změnit, pokud je to potřeba. Podívejte se také na <xref
-linkend="configureTimezoneUTC"/></para>
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Země/Oblast</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
-        <para xml:id="misc-params-system-pa3a" revision="1">Pokud nejste ve vybrané zemi, je velmi důležité, abyste opravili toto
-nastavení. Podívejte se na <xref linkend="selectCountry"/></para>
+        <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
+setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Zavaděč</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX udělal dobré výběry pro nastavení zavaděče systému.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Pokud nevíte jak nastavit Grub2, nic neměňte</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Pro více informací se podívejte na <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Správa uživatelů</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Zde můžete přidat další uživatele. Každý z nich obdrží svůj vlastní
-<literal>/home</literal> t. j. domácí adresáře.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Služby</guilabel>:</para>
-
-        <para xml:id="misc-params-system-pa6a" revision="1">Systémové služby označují tyto malé programy, které běží na pozadí
-(tzv. démoni, což je však zvrácené historické přirovnání). Tento nástroj vám
-umožňuje povolit nebo zakázat určité úlohy.</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Zde byste měli zaškrtávat opatrně, dříve než tu cokoli změníte - omyl může
-zabránit správnému běhu vašeho počítače.</para>
+        <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
+(daemons).  This tool allows you to enable or disable certain processes.</para>
 
-        <para>Pro více informací se podívejte na <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -91,10 +106,10 @@ zabránit správnému běhu vašeho počítače.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Klávesnice</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa1a" revision="1">Zde nastavujete nebo měníte rozložení vaší klávesnice, které bude záležet na
-vaší poloze, jazyku nebo typu klávesnice.</para>
+        <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
+of keyboard.</para>
 
         <note>
           <para>If you notice a wrong keyboard layout and want to change it, keep in mind
@@ -103,28 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Myš</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Zde můžete přidávat nebo nastavovat další ukazovací zařízení, tablety,
 kulové ovladače atd.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Zvuková karta</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">Instalátor používá výchozí ovladač, pokud nějaký výchozí existuje. Možnost
-výběru odlišného ovladače je dána jen tehdy, když je více než jeden ovladač
-pro vaši kartu, ale žádný z nich není výchozí.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Grafické rozhraní</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Tento oddíl vám dovoluje nastavit vaši grafickou kartu (resp. karty) a
-obrazovky.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Pro více informací se podívejte na <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -139,28 +158,28 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Síť</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
-        <para xml:id="misc-params-network-pa2" revision="1">Zde můžete nastavit vaši síť, ale pro síťové karty s nesvobodnými ovladači
-je lepší to vykonat po restartu v <application>Ovládacím centru
-Mageia</application>, pokud jste ještě nepovolili repozitáře Nesvobodných
-nosičů (Nonfree).</para>
+        <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
+repositories.</para>
 
         <warning>
-          <para xml:id="misc-params-network-pa3" revision="1">Když přidáváte síťovou kartu, nezapomeňte zároveň nastavit i váš firewall na
-sledování onoho rozhraní.</para>
+          <para xml:id="misc-params-network-pa3" revision="1">When you add a network card, do not forget to set your firewall to monitor
+that interface as well.</para>
         </warning>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxy</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">Proxy Server slouží jako zprostředkovatel mezi vaším počítačem a širším
-internetem. Tento oddíl vám dovoluje nastavit váš počítač pro využití
-některé proxy služby.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">Možná se budete potřebovat poradit s vaším systémovým správcem pro získání
-parametrů, které sem potřebujete zadat</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -172,28 +191,31 @@ parametrů, které sem potřebujete zadat</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Úroveň bezpečnosti</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Zde nastavujete Úroveň bezpečnosti pro váš počítač, ve většině případů je
-výchozí nastavení (standardní) pro běžné použití přiměřené.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Zaškrtněte volbu, která se nejlépe hodí k vašemu používání.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Firewall</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">Firewall, moravsky ohnivá zeď, má sloužit jako překážka mezi vašimi
-důležitými daty a ničemy venku na internetu, kteří by je chtěli vyzradit
-nebo ukradnout.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Vyberte si služby, které si přejete, aby měly přístup k vašemu systému. Vaše
-výběry budou záležet na tom, k čemu používáte váš počítač. Další informace
-najdete na <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Mějte na paměti, že dovolení všeho (žádný firewall) může být velmi
-riskantní.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/cs/reboot.xml b/docs/docs/stable/installer/cs/reboot.xml
index 4e562f3f..5c3db04e 100644
--- a/docs/docs/stable/installer/cs/reboot.xml
+++ b/docs/docs/stable/installer/cs/reboot.xml
@@ -1,17 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="cs" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Restartovat</title>
   </info>
   
-  <para>Když byl zavaděč nainstalován, budete vyzváni k pozastavení vašeho počítače,
-odstranění živého CD a restartování počítače. Klepněte na <emphasis
-role="bold"><guibutton>Dokončit</guibutton></emphasis> a jednejte podle
-požadavků<emphasis role="bold">, v tomto pořadí!</emphasis></para>
+  
+  <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>Když restartujete, uvidíte následnost ukazovatelů postupu stahování. Tyto
-naznačují, že jsou stahovány seznamy nosičů software (viz Správa software).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/cs/securityLevel.xml b/docs/docs/stable/installer/cs/securityLevel.xml
index f35e3b08..352a4c4a 100644
--- a/docs/docs/stable/installer/cs/securityLevel.xml
+++ b/docs/docs/stable/installer/cs/securityLevel.xml
@@ -1,32 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="securityLevel" version="5.0" xml:lang="cs">
+<section version="5.0" xml:lang="cs" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="securityLevel-ti1">Úroveň zabezpečení</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="securityLevel-ti1">Úroveň zabezpečení</title>
-    </info>
+  
 
- 
- 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-securityLevel.png"
-align="center" format="PNG" xml:id="securityLevel-im1"></imagedata>
-</imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
-    <para revision="1" xml:id="securityLevel-pa1">Zde můžete upravit vaši úroveň bezpečnosti.</para>
+  <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-    <para revision="1" xml:id="securityLevel-pa2">Ponechejte výchozí nastavení jak jsou, pokud nevíte, co si máte vybrat.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
 
-    <para revision="2" xml:id="securityLevel-pa3">I po instalaci bude vždy možné upravit vaše bezpečnostní nastavení v části
-<guilabel>Bezpečnost</guilabel> Ovládacího centra Mageii.</para>
-  </section>
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
+  <para><emphasis role="bold">Security Administrator</emphasis></para>
+
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
+send <emphasis>security alert messages</emphasis> when it detects situations
+which require notification to a system administrator.</para>
+
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
+
+  <note>
+    <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
+messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
+be configured for receiving such mail!</para>
+  </note>
+
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/cs/selectCountry.xml b/docs/docs/stable/installer/cs/selectCountry.xml
index 401e156d..b23b1a3c 100644
--- a/docs/docs/stable/installer/cs/selectCountry.xml
+++ b/docs/docs/stable/installer/cs/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="cs">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="cs">
   <info>
     <title xml:id="selectCountry-ti1">Vyberte zemi</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Vyberte vaši zemi nebo oblast. Toto je důležité pro všechny druhy nastavení,
-jako jsou měna a bezdrátová regulační doména. Nastavení nesprávné země může
-vést k neschopnosti používání bezdrátové sítě.</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+like the currency and wireless regulatory domain. Setting the wrong country
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">Pokud vaše země není v seznamu, klepněte na tlačítko <guilabel>Ostatní
-země</guilabel> a tam si vyberte vaši zemi/oblast.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">Pokud je vaše země jen v seznamu <guilabel>ostatních zemí</guilabel>, po
-klepnutí na <guibutton>OK</guibutton> se může zdát, že země byla vybrána ze
-seznamu. Tohoto si, prosím, nevšímejte, DrakX bude následovat vaši skutečnou
-volbu.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,21 +40,19 @@ volbu.</para>
       <title xml:id="inputMethod-ti7">Vstupní metoda</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">Na obrazovce <guilabel>Ostatní země</guilabel> si též můžete zvolit vstupní
-metodu (v seznamu dole). Vstupní metody uživatelům dovolují vkládat
-vícejazyčné znaky (čínské, japonské, korejské atd.). IBus je výchozí vstupní
-metoda na Mageia DVDčkách, Afrika/Indie a Asie/ne-Indie na
-Živých-CDčkách. Pro asijské a africké místní nastavení, bude IBus nastavena
-jako výchozí vstupní metoda, takže uživatelé by neměli potřebovat ji
-nastavovat ručně. Jiné vstupní metody (SCIM, GCIN, HIME atd.) též poskytují
-podobné funkce a mohou být nainstalovány, pokud jste přidali HTTP/FTP nosič
-před výběrem balíčků.</para>
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
+input method (at the bottom of the list). Input methods allow users to input
+multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
+default input method, so users should not need to configure it
+manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
+functions and can be installed if you added HTTP/FTP media before package
+selection.</para>
 
     <note>
-      <para xml:id="selectCountry-pa5" revision="1">Pokud jste během instalace vynechali nastavení vstupní metody, můžete ji
-zpřístupnit po restartu vašeho nainstalovaného systému přes "Nastavit váš
-počítač"→ "Systém", anebo spuštěním localedrake jako superuživatel (správce
-root).</para>
+      <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/selectInstallClass.xml b/docs/docs/stable/installer/cs/selectInstallClass.xml
index e634e419..dca9b952 100644
--- a/docs/docs/stable/installer/cs/selectInstallClass.xml
+++ b/docs/docs/stable/installer/cs/selectInstallClass.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- 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="cs" xml:id="selectInstallClass">
+<section version="5.0" xml:lang="cs" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
 
   
 
@@ -14,6 +15,13 @@
   
 
   
+
+  
+
+  
+
+  
+
   
 
   <info>
@@ -23,55 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Instalace nebo aktualizace</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectInstallClass.png" align="center"
-format="PNG"></imagedata> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Instalace</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Použijte tuto volbu pro čerstvou instalaci
-<application>Mageii</application>.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Aktualizace</para>
-
-      <para>Pokud máte v systému jednu nebo více instalací
-<application>Mageii</application>, instalátor vám dovolí aktualizovat jednu
-z nich na nejnovější vydání.</para>
-
-<warning>
-	<para>Pouze aktualizování z předchozí verze Mageii, která byla <emphasis>ještě
-podporována</emphasis>, když byla vydána verze tohoto instalátoru, bylo
-důkladně odzkoušeno. Pokud chcete aktualizovat verzi Mageii, která už
-dosáhla svého konce životnosti, když byla vydána tato verze, potom je lepší
-udělat čistou instalaci, přičemž si ponecháte váš domovský oddíl
-<literal>/home</literal>.</para>
-</warning>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
+
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>Pokud se během instalace rozhodnete instalaci zastavit, je možné restartovat
-počítač, ale dříve než toto uděláte, si to prosím důkladně zvažte. Když už
-byl oddíl jednou naformátován nebo se začaly instalovat aktualizace, váš
-počítač už nadále není ve stejném stavu a jeho restartování by vás mohlo
-velmi lehce zanechat s nepoužitelným systémem. Pokud si jste přesto přese
-všechno velmi jistí, že restartování je to, co chcete, jděte do textového
-terminálu současným stisknutím tří kláves
-<guilabel>Alt+Ctrl+F2</guilabel>. Potom současně stiskněte
-<guilabel>Alt+Ctrl+Delete</guilabel> pro restart.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
-    <para>Pokud jste objevili, že jste zapomenuli vybrat nějaký doplňkový jazyk,
-můžete se vrátit z obrazovky "Instalace a aktualizace" k výběru jazyka
-současným stisknutím <guilabel>Alt+Ctrl+Home</guilabel>. Toto však už
-<emphasis>nedělejte</emphasis> později během instalace.</para>
+    <para>If you have discovered that you forgot to select an additional language, you
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
 </section>
diff --git a/docs/docs/stable/installer/cs/selectKeyboard.xml b/docs/docs/stable/installer/cs/selectKeyboard.xml
index 226df2bb..8114a3b0 100644
--- a/docs/docs/stable/installer/cs/selectKeyboard.xml
+++ b/docs/docs/stable/installer/cs/selectKeyboard.xml
@@ -10,9 +10,18 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Klávesnice</title>
   </info>
 
@@ -20,7 +29,7 @@
 vhodná klávesnice, bude jako výchozí použito rozložení klávesnice US.</para>
 
   <mediaobject>
-<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png" />
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
@@ -34,23 +43,22 @@ xlink:href="https://cs.wikipedia.org/wiki/Rozlo%C5%BEen%C3%AD_kl%C3%A1ves">cs.wi
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="selectKeyboard-pa3">Pokud vaše klávesnice není v zobrazeném seznamu, klepněte na
-<guibutton>Více</guibutton> pro získání úplného seznamu a vyberte klávesnici
-tam.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">Po vybrání klávesnice z dialogu <guibutton>Více</guibutton> se vrátíte k
-prvnímu dialogu pro výběr klávesnice a bude se zdát, jakoby byla zvolena
-klávesnice z této obrazovky. Popsané odchylky si nemusíte všímat a můžete
-pokračovat v instalaci: Vaše klávesnice je ta, kterou jste si vybrali z
-plného seznamu.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="selectKeyboard-pa4">Pokud jste si vybrali klávesnici založenou na nelatinských znacích, uvidíte
-další dialogovou obrazovku ptající se, jak byste chtěli přepínat mezi
-latinským a nelatinským rozložením klávesnice.</para>
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
+extra dialogue screen asking how you would prefer to switch between the
+Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/cs/selectKeyboardLive.xml b/docs/docs/stable/installer/cs/selectKeyboardLive.xml
index eafb17ba..1103ec3f 100644
--- a/docs/docs/stable/installer/cs/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/cs/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Vyberte si klávesnici</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>Budete si muset vybrat rozložení klávesnice, které si přejete používat v
-Mageii. Výchozí je vybrána přiměřeně k vašemu jazyku a předchozí vybrané
-časové oblasti.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/cs/selectLanguage.xml b/docs/docs/stable/installer/cs/selectLanguage.xml
index e92f9e7b..ccd1d2f3 100644
--- a/docs/docs/stable/installer/cs/selectLanguage.xml
+++ b/docs/docs/stable/installer/cs/selectLanguage.xml
@@ -1,9 +1,33 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="cs" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
   
+
   
+
   
+
   
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 04 01, using barjac's text -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -12,40 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Zvolte si, prosím, jazyk, který chcete používat</title>
   </info>
-  <para condition="classical">Vyberte si váš oblíbený jazyk, tím že nejprve rozbalíte seznam pro váš
-světadíl. <application>Mageia</application> použije tento výběr během
-instalace a pro váš instalovaný systém.</para>
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
-  <para condition="classical">Je možné, že budete potřebovat mít ve vašem systému nainstalováno více
-jazyků, pro sebe nebo pro ostatní uživatele, potom byste měli použít
-tlačítko <guibutton>Více jazyků</guibutton> pro jejich přidání nyní. Bude
-náročné přidat další jazykovou podporu po instalaci.</para>
+
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
+
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
+
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
-  <warning condition="classical">
-    <para>Pokud jste si i zvolili více než jeden jazyk, musíte si nejprve vybrat jeden
-z nich jako váš upřednostňovaný jazyk na první jazykové obrazovce. Ten bude
-též označen jako vybraný na obrazovce s vícero jazyky.</para>
-  </warning>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
+
   <itemizedlist>
     <listitem condition="classical">
-      <para>Pokud jazyk vaší klávesnice není ten samý jako váš upřednostňovaný jazyk,
-potom se doporučuje nainstalovat stejně tak jazyk vaší klávesnice.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
+
     <listitem>
-      <para>Mageia používá jako výchozí podporu pro UTF-8 (Unicode).</para>
-      <para condition="classical">Tato může být vypnuta na obrazovce "více jazyků", pokud víte, že je nevhodná
-pro váš jazyk. Zakázání UTF-8 se použije pro všechny nainstalované jazyky.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
+
     <listitem>
-      <para>Jazyk vašeho systému po instalaci můžete změnit v nabídce Ovládací centrum
-Mageia -> Systém -> Spravovat lokalizaci pro váš systém.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/cs/selectMouse.xml b/docs/docs/stable/installer/cs/selectMouse.xml
index 1ec33c90..77826187 100644
--- a/docs/docs/stable/installer/cs/selectMouse.xml
+++ b/docs/docs/stable/installer/cs/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="cs">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Výběr myši</title>
   </info>
@@ -7,26 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Pokud nejste spokojeni s tím, jak vaše myš reaguje, můžete zde vybrat jiný
 typ.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Obyčejně je <guilabel>Univerzální</guilabel> - <guilabel>kterákoli
-PS/2</guilabel> a <guilabel>USB myš</guilabel> je dobrou volbou.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Vyberte <guilabel>Univerzální</guilabel> - <guilabel>Vynutit
-evdev</guilabel> pro nastavení tlačítek, která nefungují na myši mající šest
-nebo více tlačítek.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/cs/setupBootloader.xml b/docs/docs/stable/installer/cs/setupBootloader.xml
index fd1da429..c0001ceb 100644
--- a/docs/docs/stable/installer/cs/setupBootloader.xml
+++ b/docs/docs/stable/installer/cs/setupBootloader.xml
@@ -1,227 +1,198 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="cs" xml:id="setupBootloader">
+  
+  
+  
+  
   
-
   
-
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Základní nastavení zaváděcího programu</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
-
   <section>
-    <title>Rozhraní zavaděče</title>
-
-    <para>Ve výchozím stavu Mageia používá výhradně:</para>
-
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi pro UEFI systémy.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-
-    <tip>
-      <para>Grafické nabídky Mageii jsou hezké :)</para>
-    </tip>
-
-    <section>
-      <title>Grub2 na systémech Legacy/MBR a Legacy/GPT</title>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-
-      <para>Neupravujte "Zaváděcí zařízení", pokud s jistotou nevíte, co děláte.</para>
-    </section>
-
-    <section>
-      <title>Grub2-efi na UEFI systémech</title>
-
-      <para>Se systémem UEFI je uživatelské rozhraní trochu odlišné, protože si nemůžete
-volit postup s nebo bez grafické nabídky</para>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-
-      <para>Pokud je Mageia jediným systémem nainstalovaným na váš počítač, instalátor
-vytvořil ESP (systémový oddíl EFI) pro zapsání zavaděče (Grub2-efi). Pokud
-ve vašem počítači byly už předtím nainstalovány operační systémy UEFI
-(například Windows 8), instalátor Mageii zjistil stávající ESP vytvořený
-operačním systémem Windows a přidal grub2-efi. Ačkoli je možno mít více
-oddílů ESP, radí se mít a stačí jen jeden, bez ohledu na počet operačních
-systémů, které máte v počítači.</para>
-
-      <para>Neupravujte "Zaváděcí zařízení", pokud s jistotou nevíte, co děláte.</para>
-    </section>
-  </section>
-
-  <section>
-    <title xml:id="setupMageiaBootloader">Použití zavaděče Mageii</title>
-
-    <para>Ve výchozím nastavení, podle systému, zapíše Mageia nový:</para>
-
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard
-drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi zavaděč do ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then uncheck the box
-<guilabel>Probe Foreign OS</guilabel></para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
-
   <section>
-    <title>Použití už existujícího zavaděče</title>
-
-    <para>Přesný postup pro přidání vašeho systému Mageia k existujícímu zavaděči
-přesahuje oblast této nápovědy, avšak ve většině případů bude zahrnovat
-spuštění příslušného programu na instalaci zavaděče, který by ho měl
-rozpoznat a přidat automaticky. Podívejte se na dokumentaci k operačnímu
-systému, o nějž jde.</para>
-  </section>
-
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-
-    <para>If you don't want a bootable Mageia, but to chain load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-
-    <para>Dostanete varování, že chybí zavaděč. Nevšímejte si toho a klepněte na
-<guibutton>OK</guibutton>.</para>
-
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-
-  <section>
-    <title>Volby</title>
-
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>První strana</title>
-
-      <para><itemizedlist>
-          <listitem>
-            <para><guilabel>Delay before booting the default image</guilabel>: This text box
-lets you set a delay in seconds before the default operating system is
-started up.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be asked at the boot
-time to select a booting entry or change settings. The username is "root"
-and the password is the one chosen here after.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Heslo</guilabel>: Do tohoto textového pole vložíte heslo</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Heslo (znovu)</guilabel>: Znovu zadejte heslo a drakx zkontroluje,
-zda odpovídá heslu zadanému výše.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Pokročilé</guilabel></para>
-
-            <itemizedlist>
-              <listitem>
-                <para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for the power management. It can save energy by
-stopping unused devices, this was the method used before APM. Unchecking it
+      <title>Základní nastavení zaváděcího programu</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable SMP</guilabel>: This option enables / disables symmetric
-multiprocessing for multi core processors.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the
-operating system access to the Advanced Programmable Interrupt
-Controller. APIC devices permit more complex priority models, and Advanced
-IRQ (Interrupt Request)  management.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which
-manages all external interrupts for a specific processor in an SMP system.</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist></para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
-
     <section>
-      <title>Další strana</title>
-
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Vyzkoušet cizí operační systém</guilabel>: viz výše <link
-linkend="setupMageiaBootloader">Používat Mageiin zavaděč</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
-
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Pokročilé</guilabel><itemizedlist>
-              <listitem>
-                <para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-the boot menu will use. If you click the down triangle you will be offered
-other size and colour depth options.</para>
-              </listitem>
-
-              <listitem>
-                <para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para>
-              </listitem>
-            </itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Použití už existujícího zavaděče</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Přidaní nebo změna položky v nabídce zavaděče</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/setupBootloaderAddEntry.xml b/docs/docs/stable/installer/cs/setupBootloaderAddEntry.xml
index d1d929e8..474292a0 100644
--- a/docs/docs/stable/installer/cs/setupBootloaderAddEntry.xml
+++ b/docs/docs/stable/installer/cs/setupBootloaderAddEntry.xml
@@ -1,15 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns5="http://www.w3.org/2000/svg" version="5.0" xml:lang="cs" xml:id="setupBootloaderAddEntry">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="setupBootloaderAddEntry">
   
+
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
 
 Lebarhon 2016 12 16 Updated for Mageia 6-->
 <title xml:id="setupBootloaderAddEntry-ti1">Přidaní nebo změna položky v nabídce zavaděče</title>
   </info>
-  <para>To do that you need to manually edit /boot/grub2/custom.cfg or use the
-software grub-customizer instead (Available in the Mageia repositories).</para>
+
+  <para>To do this you need to manually edit /boot/grub2/custom.cfg or use the
+software <emphasis role="bold">grub-customizer</emphasis> tool instead
+(available in the Mageia repositories).</para>
+
   <note>
-    <para>Pro více informací se podívejte na naše stránky: <link
+    <para>For more information, see: <link
 ns2:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
   </note>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/setupSCSI.xml b/docs/docs/stable/installer/cs/setupSCSI.xml
index 213d7bb3..2a4823b7 100644
--- a/docs/docs/stable/installer/cs/setupSCSI.xml
+++ b/docs/docs/stable/installer/cs/setupSCSI.xml
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="setupSCSI" version="5.0" xml:lang="cs">
-
+<section version="5.0" xml:lang="cs" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Nastavení SCSI</title>
   </info>
 
   
+
   
+
   
+
   
-   
+
   
+
   
+
   
+
   
+
   
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- JohnR - edited 2012-03-03 -->
@@ -30,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata revision="1" fileref="dx2-setupSCSI.png"
-format="PNG" align="center" xml:id="setupSCSI-im1"></imagedata>
-</imageobject></mediaobject>
-
-  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX obvykle zjistí pevné disky správně. U některých starších řadičů SCSI
-může být schopen určit a použít správné ovladače, ale následně nedokáže
-rozpoznat disk.</para>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="setupSCSI-pa2">Pokud k tomuto dojde, budete muset ručně říci Drakx, jaký disk(y) SCSI máte.</para>
+  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
+SCSI controllers it may be unable to determine the correct drivers to use
+and subsequently fail to recognise the drive.</para>
 
-  <para revision="3" xml:id="setupSCSI-pa3">DrakX by pak měl být schopen správně nastavit disk(y).</para>
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
 </section>
diff --git a/docs/docs/stable/installer/cs/software.xml b/docs/docs/stable/installer/cs/software.xml
new file mode 100644
index 00000000..b249f571
--- /dev/null
+++ b/docs/docs/stable/installer/cs/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="cs" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/cs/soundConfig.xml b/docs/docs/stable/installer/cs/soundConfig.xml
index 6af77f88..075f9d54 100644
--- a/docs/docs/stable/installer/cs/soundConfig.xml
+++ b/docs/docs/stable/installer/cs/soundConfig.xml
@@ -1,41 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="cs">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Nastavení zvuku</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Na této obrazovce je udán název ovladače, který zvolil instalátor pro vaši
-zvukovou kartu, což bude výchozí ovladač, pokud máte některý určen jako
-výchozí.</para>
+  
 
-  <para>Výchozí ovladač by měl pracovat bez problémů. Avšak, pokud se po instalaci
-střetáváte s problémy, potom spustěte příkaz <command>draksound</command>
-nebo spustěte tento nástroj přes nabídku MCC (Ovládací centrum Mageii),
-zvolením panelu <guilabel>Hardware</guilabel> a klepnutím na
-<guilabel>Nastavení zvuku</guilabel> v horní pravé části obrazovky.</para>
+  
 
-  <para>Potom na obrazovce draksound nebo nástroje na "Nastavení zvuku", klepněte na
-<guibutton>Rozšíření</guibutton> a potom na <guibutton>Řešení
-problémů</guibutton>, abyste našli velmi užitečnou radu o tom, jak vyřešit
-problém.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Rozšíření</title>
     </info>
 
-    <para>Klepnutí na <guibutton>Rozšíření</guibutton> na této obrazovce, během
-instalace, je užitečné tehdy, pokud tu není žádný výchozí ovladač a je tu
-dostupných více ovládačů, ale vy si myslíte, že instalátor vybral nesprávný
-ovladač.</para>
-
-    <para>V tom případě můžete zvolit odlišný ovladač po klepnutí na <guibutton>Nechat
-mě vybrat jiný ovladač</guibutton>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/cs/takeOverHdConfirm.xml b/docs/docs/stable/installer/cs/takeOverHdConfirm.xml
index 5403c3de..29a63e10 100644
--- a/docs/docs/stable/installer/cs/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/cs/takeOverHdConfirm.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="cs" xml:id="takeOverHdConfirm">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Potvrzení naformátování pevného disku</title>
   </info>
@@ -7,7 +13,11 @@
   
 
   
+
   
+
+  
+
   
 
   
@@ -19,16 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition='live'> <imagedata
-fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
-fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject></mediaobject>
-
-  <para revision="1" xml:id="takeOverHdConfirm-pa1">Klepněte na <guibutton>Předchozí</guibutton>, pokud si nejste jistí vaší
-volbou.</para>
-
-  <para revision="1" xml:id="takeOverHdConfirm-pa2">Klepněte na <guibutton>Další</guibutton>, pokud si jste jistí a chcete
-smazat každý oddíl, každý operační systém a všechny údaje na onom pevném
-disku.</para>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
+choice.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/cs/testing.xml b/docs/docs/stable/installer/cs/testing.xml
index 1712a8b4..f71c2134 100644
--- a/docs/docs/stable/installer/cs/testing.xml
+++ b/docs/docs/stable/installer/cs/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Vyzkoušení Mageii jako Živého systému</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Vyzkoušení Mageii jako Živého systému</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,21 +17,20 @@
       <title xml:id="testing1-ti1">Živý režim</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>Tuto obrazovku dostanete, pokud jste si vybrali "Zavést Mageiu". Pokud ne,
-tak dostanete krok "<link linkend="doPartitionDisks">Rozdělení disku</link>"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Zkoušení hardware</title>
       </info>
 
-      <para>Jeden z cílů Živého režimu je vyzkoušet, zda je hardware Mageiou správně
-spravován. Můžete zkontrolovat, zda všechna zařízení mají svůj ovladač v
-části Hardware Ovládacího centra Mageii. Můžete vyzkoušet většinu současných
-zařízení:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -36,11 +38,7 @@ zařízení:</para>
         </listitem>
 
         <listitem>
-          <para>grafická karta: pokud jste už viděli předešlou obrazovku, tak je už OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webová kamera:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -48,7 +46,7 @@ zařízení:</para>
         </listitem>
 
         <listitem>
-          <para>tiskárna: nastavte ji a vytiskněte zkušební stránku</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -56,10 +54,13 @@ zařízení:</para>
         </listitem>
       </itemizedlist>
 
-      <para>Pokud je to všechno pro vás v pořádku, můžete provést instalaci. Pokud ne,
-můžete odejít pomocí tlačítka pro skončení.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>Nastavení nastavení, která jste tu udělali, jsou zachována pro instalaci.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -67,14 +68,14 @@ můžete odejít pomocí tlačítka pro skončení.</para>
         <title xml:id="testing3-ti1">Spustit instalaci</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>Pro spuštění instalace z Mageia LiveCD nebo Live DVD na pevný disk anebo
-mechaniku SSD, jednoduše klepněte na ikonu "Instalovat na pevný
-disk". Obdržíte tuto obrazovku, a potom krok pro "<link
-linkend="doPartitionDisks">Rozdělení disku</link>" jako u přímé instalace.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/cs/uninstall-Mageia.xml b/docs/docs/stable/installer/cs/uninstall-Mageia.xml
index 38953492..d094b702 100644
--- a/docs/docs/stable/installer/cs/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/cs/uninstall-Mageia.xml
@@ -1,39 +1,48 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="cs">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="cs" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Odinstalování Mageii</title>
   </info>
 
   
 
-  <section>
-    <title xml:id="uninstall-Mageia-ti2">Jak na to</title>
+  
 
-    <para>Pokud vás Mageia nepřesvědčila, nebo ji nemůžete správně nainstalovat,
-zkrátka pokud se jí chcete zbavit. Je to vaše právo a Mageia vám dává i
-možnost odinstalování. Toto neplatí u každého operačního systému.</para>
+  <para>If Mageia didn't convince you or you can't install it correctly - in short
+you want get rid of it - that is your right and Mageia also gives you the
+possibility to uninstall. This is not true for every operating system.</para>
 
-    <para>Po zazálohování si vašich dat, restartujte počítač s vaším instalačním DVD
-Mageii a vyberte Záchranný systém, potom, Obnovit zavaděč Windows. Při
-dalším zavedení budete mít jen Windows bez možnosti volby vašeho operačního
-systému.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-    <para>Pro obnovu místa použitého oddíly neboli diskovými oddíly Mageii ve Windows,
-klepněte na <code>Start → Ovládací panely → Nástroje na správu → Správa
-počítače → Ukládací prostor → Správa disků</code> pro zpřístupnění
-spravování oddílů. Oddíly Mageii rozpoznáte, protože jsou označeny jako
-<guilabel>Neznámé</guilabel>, a též podle velikosti a umístění na
-disku. Klepněte pravým tlačítkem na tyto oddíly a zvolte
-<guibutton>Smazat</guibutton>. Prostor bude uvolněn.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-    <para>Pokud používáte Windows XP, můžete vytvořit nový oddíl a naformátovat jej
-(FAT32 nebo NTFS). Bude mu přiřazeno písmeno oddílu.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
-    <para>Pokud máte Windows Vista nebo Windows 7, máte o jednu možnost víc, můžete
-rozšířit existující oddíl, který je vlevo od volného místa. Jsou i jiné
-nástroje na dělení disku, které můžou být použity, jako je gparted, dostupný
-jak pro Windows tak pro Linux. Jako obyčejně, při změnách oddílů buďte velmi
-opatrní a ujistěte se, že všechny důležité věci byly zazálohovány.</para>
-  </section>
-</section>
\ No newline at end of file
+  <para>If you have Vista or 7, you have one more possibility, you can extend the
+existing partition that is at the left of the freed space. There are other
+partitioning tools that can be used, such as <emphasis
+role="bold">gparted</emphasis>, available for both Windows and Linux. As
+always, when changing partitions, be very careful to back up anything
+important to you.</para>
+</section>
diff --git a/docs/docs/stable/installer/cs/unused.xml b/docs/docs/stable/installer/cs/unused.xml
index 16b3d291..32b18191 100644
--- a/docs/docs/stable/installer/cs/unused.xml
+++ b/docs/docs/stable/installer/cs/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="cs" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="cs">
   <info>
     <title xml:id="unused-ti1">Ponechat nebo smazat nepoužitý materiál</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
 
-  <para>V tomto kroku instalátor hledá nevyužité jazykové balíčky a nevyužité
-hardwarové balíčky. Potom vám navrhne jejich vymazání. Je dobrou myšlenkou
-přijmout to, kromě případu, že připravujete instalaci, která má běžet na
-odlišném počítačovém vybavení.</para>
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>Dalším krokem je kopírování souborů na pevný disk. Toto zabere několik
-minut. Na konci dostanete na určitý čas prázdnou obrazovku. To je normální.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/el/.directory b/docs/docs/stable/installer/el/.directory
new file mode 100644
index 00000000..b5f8375c
--- /dev/null
+++ b/docs/docs/stable/installer/el/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2018,12,22,12,34,47
+Version=4
+ViewMode=1
diff --git a/docs/docs/stable/installer/el/DrakX-cover.xml b/docs/docs/stable/installer/el/DrakX-cover.xml
index 4b210242..c8821c37 100644
--- a/docs/docs/stable/installer/el/DrakX-cover.xml
+++ b/docs/docs/stable/installer/el/DrakX-cover.xml
@@ -4,6 +4,7 @@
 <book version="5.0" xml:lang="el" xml:id="Quick-Startup"
       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"
@@ -55,20 +56,21 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">Ομάδα της
 
     
 
+    
+
     <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Εγκατάσταση με το DrakX</title>
 
-    <para>
-      <note>
+    <para><note>
         <para>Κανένας δεν βλέπει όλες τις οθόνες του εγκαταστάτη που υπάρχουν σε αυτό το
 εγχειρίδιο. Για το ποιες οθόνες θα βλέπετε, εξαρτάται από το υλικό σας και
 τις επιλογές που κάνετε κατά την εγκατάσταση.</para>
-      </note>
-    </para>
+      </note></para>
 
     
 
@@ -130,13 +132,15 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">Ομάδα της
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-    <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
     
 
     <!-- <xi:include href="configureX_card_list.xml"/>
 
 
+    <xi:include href="configureX_chooser.xml"/>
+
   <xi:include href="configureX_monitor.xml"/> -->
 <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/installer/el/DrakX-inline.xml b/docs/docs/stable/installer/el/DrakX-inline.xml
new file mode 100644
index 00000000..84eb231c
--- /dev/null
+++ b/docs/docs/stable/installer/el/DrakX-inline.xml
@@ -0,0 +1,140 @@
+<?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="el" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Εγκατάσταση με το DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>Κανένας δεν βλέπει όλες τις οθόνες του εγκαταστάτη που υπάρχουν σε αυτό το
+εγχειρίδιο. Για το ποιες οθόνες θα βλέπετε, εξαρτάται από το υλικό σας και
+τις επιλογές που κάνετε κατά την εγκατάσταση.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Τα κείμενα και τα στιγμιότυπα σε αυτό το εγχειρίδιο είναι διαθέσιμα υπό την
+άδεια χρήσης CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/deed.el</link></para>
+
+      <para>Αυτό το εγχειρίδιο δημιουργήθηκε με τη βοήθεια του προγράμματος <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> που αναπτύσσεται από
+την <link ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+      <para>Δημιουργήθηκε από εθελοντές δουλεύοντας στον ελεύθερο χρόνο τους. Αν
+επιθυμείτε να βοηθήσετε στην βελτίωση του εγχειριδίου, παρακαλώ
+επικοινωνήστε με την <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Ομάδα της
+τεκμηρίωσης</link>.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/el/DrakX.xml b/docs/docs/stable/installer/el/DrakX.xml
index 86cfbe9d..3e3765ce 100644
--- a/docs/docs/stable/installer/el/DrakX.xml
+++ b/docs/docs/stable/installer/el/DrakX.xml
@@ -30,6 +30,7 @@
 
   
 
+  
   <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <info>
@@ -45,6 +46,7 @@
 <!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
   b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
 <!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
 <title>Εγκατάσταση με το DrakX</title>
 
     <cover>
@@ -128,12 +130,14 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">Ομάδα της
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
   
 
-  <!-- <xi:include href="configureX_card_list.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
+  
+  <xi:include href="configureX_card_list.xml"/>
 
   <xi:include href="configureX_monitor.xml"/> -->
 <xi:include href="setupBootloader.xml"/>
diff --git a/docs/docs/stable/installer/el/bootLive.xml b/docs/docs/stable/installer/el/bootLive.xml
index fe661490..a28211a4 100644
--- a/docs/docs/stable/installer/el/bootLive.xml
+++ b/docs/docs/stable/installer/el/bootLive.xml
@@ -17,6 +17,8 @@
 
   
 
+  
+
   <info>
     <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
 <!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
@@ -24,6 +26,8 @@
 <!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
 <!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
 <!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
 <title xml:id="bootLive-ti1">Εκκίνηση της Mageia ως σύστημα Live</title>
   </info>
 
@@ -145,7 +149,7 @@ format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
       <listitem>
         <para><emphasis role="bold">Εκκίνηση της Mageia</emphasis></para>
 
-        <para>This option will boot the Mageia Live system from the connected Dvd/USB
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
 media (expect a very slow system compared to an installed OS).  Once the
 boot is done, you can proceed to the installation</para>
       </listitem>
diff --git a/docs/docs/stable/installer/el/configureX_chooser.xml b/docs/docs/stable/installer/el/configureX_chooser.xml
index be496904..bfed3ab6 100644
--- a/docs/docs/stable/installer/el/configureX_chooser.xml
+++ b/docs/docs/stable/installer/el/configureX_chooser.xml
@@ -19,11 +19,14 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
 <!--2018/02/15 apb: Some text and typography.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -32,8 +35,10 @@ you chose for this install of Mageia, they are all based on a graphical user
 interface system called <literal>X Window System</literal>, or simply
 <quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
 graphical environment to work well, the following <quote>X</quote> settings
-need to be correct. Choose the appropriate settings - if none are shown, or
-if you think the details are incorrect.</para>
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
@@ -46,8 +51,8 @@ list. See <xref linkend="configureX_card_list"/>.</para>
     <listitem>
       <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
 
-      <para>You can choose Plug'n Play, if applicable, or choose your monitor from the
-<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> list. Choose
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
 <emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
 vertical refresh rates of your monitor. See <xref
 linkend="configureX_monitor"/>.</para>
@@ -56,17 +61,17 @@ linkend="configureX_monitor"/>.</para>
     <listitem>
       <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
 
-      <para>The resolution and color depth of your monitor can be set here</para>
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
       <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
 
       <para>The test button does not always appear during install. If the option is
-there, and you test your settings, you should be asked whether your settings
-are correct. If you answer <emphasis>Yes</emphasis>, the settings will be
-kept. If you don't see anything, you'll return to the configuration screen
-and be able to reconfigure everything until the test result is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
 satisfactory. If the test option is not available, then make sure your
 settings are on the safe side.</para>
     </listitem>
@@ -74,7 +79,7 @@ settings are on the safe side.</para>
     <listitem>
       <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
 
-      <para>Here you can choose to enable or disable various options</para>
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
 
@@ -84,8 +89,4 @@ outside the frequency range of that monitor. This applies to older CRT
 displays: modern monitors will reject an unsupported frequency and normally
 enter standby mode.</para>
   </warning>
-
-  <xi:include href="configureX_card_list.xml"/>
-
-  <xi:include href="configureX_monitor.xml"/>
 </section>
diff --git a/docs/docs/stable/installer/el/doPartitionDisks.xml b/docs/docs/stable/installer/el/doPartitionDisks.xml
index 0d9b389b..ea8664e8 100644
--- a/docs/docs/stable/installer/el/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/el/doPartitionDisks.xml
@@ -18,6 +18,8 @@
 
   
 
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -28,6 +30,7 @@ lebarhon 20170209 added SC-->
   but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
 <title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
@@ -137,9 +140,7 @@ with a maximum of 50 GB</para>
         </listitem>
 
         <listitem>
-          <para>the rest (at least 12/19) is allocated to
-<emphasis>/</emphasis><filename>home</filename><emphasis
-role="bold">.</emphasis></para>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
         </listitem>
       </itemizedlist>
     </listitem>
@@ -158,7 +159,7 @@ create three partitions:</para>
     </listitem>
 
     <listitem>
-      <para>and the remainder for <filename>/home</filename>.</para>
+      <para>and the remainder for <filename>/home</filename></para>
     </listitem>
   </itemizedlist>
 
diff --git a/docs/docs/stable/installer/el/graphicalConfiguration.xml b/docs/docs/stable/installer/el/graphicalConfiguration.xml
new file mode 100644
index 00000000..fb314c64
--- /dev/null
+++ b/docs/docs/stable/installer/el/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="el" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/en/.directory b/docs/docs/stable/installer/en/.directory
new file mode 100644
index 00000000..d393bfe3
--- /dev/null
+++ b/docs/docs/stable/installer/en/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2019,1,8,22,31,47
+Version=4
+ViewMode=1
diff --git a/docs/docs/stable/installer/eo/DrakLive-cover.xml b/docs/docs/stable/installer/eo/DrakLive-cover.xml
index 3e5b555d..5c9a346e 100644
--- a/docs/docs/stable/installer/eo/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/eo/DrakLive-cover.xml
@@ -1,75 +1,103 @@
-<?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="eo" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="eo" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Installation from LIVE medium</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>January 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Installation from LIVE medium</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">The Official Documentation for Mageia</para>
+      <para role="tagline">The Official Documentation for Mageia</para>
+
       <mediaobject>
-<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
-            <para>La tekstoj kaj la ekranbildoj en ĉi helpo estas sub licenco CC-BY-SA 3.0
+<imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
+
+      <para>La tekstoj kaj la ekranbildoj en ĉi helpo estas sub licenco CC-BY-SA 3.0
 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-            </para>
-            <para>Tiu ĉi helpo estas skribita kun helpo de <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Tiu ĉi helpo estas skribita kun helpo de <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> kreita per <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="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> 
+Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
+
   <article>
     <title>Installation from LIVE medium</title>
-       <para><note>
-          <para>Neniu vidos ĉiujn ekranojn, kiujn vi vidas en ĉi helpo. Tio kiujn ekranojn
+
+    <para><note>
+        <para>Neniu vidos ĉiujn ekranojn, kiujn vi vidas en ĉi helpo. Tio kiujn ekranojn
 vi vidos, dependas de via komputilo kaj viaj elektoj dum instalado.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/eo/DrakLive.xml b/docs/docs/stable/installer/eo/DrakLive.xml
index 46d59863..54ae3f45 100644
--- a/docs/docs/stable/installer/eo/DrakLive.xml
+++ b/docs/docs/stable/installer/eo/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="eo" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="eo" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Installation from LIVE medium</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Installation from LIVE medium</title>
 
     <cover>
       <para><note>
@@ -16,7 +31,7 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> kreita per <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
 
-      <para>It was written by volunteers in their free time. Please contact <link
+      <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>
@@ -38,7 +53,12 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -48,17 +68,18 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/eo/DrakX-cover.xml b/docs/docs/stable/installer/eo/DrakX-cover.xml
index f96762d9..26ce7289 100644
--- a/docs/docs/stable/installer/eo/DrakX-cover.xml
+++ b/docs/docs/stable/installer/eo/DrakX-cover.xml
@@ -1,114 +1,153 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="eo" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="eo" xml:id="Quick-Startup"
+      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>Instalado per DrakX-o</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>February 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>February 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">The Official Documentation for Mageia</para>
+      <para role="tagline">The Official Documentation for Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>La tekstoj kaj la ekranbildoj en ĉi helpo estas sub licenco CC-BY-SA 3.0
+
+      <para>La tekstoj kaj la ekranbildoj en ĉi helpo estas sub licenco CC-BY-SA 3.0
 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-	    </para>
-	    <para>Tiu ĉi helpo estas skribita kun helpo de <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Tiu ĉi helpo estas skribita kun helpo de <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> kreita per <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="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> 
+Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Instalado per DrakX-o</title>
-       <para><note>
-          <para>Neniu vidos ĉiujn ekranojn, kiujn vi vidas en ĉi helpo. Tio kiujn ekranojn
+
+    <para><note>
+        <para>Neniu vidos ĉiujn ekranojn, kiujn vi vidas en ĉi helpo. Tio kiujn ekranojn
 vi vidos, dependas de via komputilo kaj viaj elektoj dum instalado.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -116,29 +155,32 @@ vi vidos, dependas de via komputilo kaj viaj elektoj dum instalado.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/eo/DrakX-inline.xml b/docs/docs/stable/installer/eo/DrakX-inline.xml
new file mode 100644
index 00000000..c288fe87
--- /dev/null
+++ b/docs/docs/stable/installer/eo/DrakX-inline.xml
@@ -0,0 +1,137 @@
+<?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="eo" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Instalado per DrakX-o</title>
+
+    <cover>
+      <para><note>
+          <para>Neniu vidos ĉiujn ekranojn, kiujn vi vidas en ĉi helpo. Tio kiujn ekranojn
+vi vidos, dependas de via komputilo kaj viaj elektoj dum instalado.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">La tekstoj kaj la ekranbildoj en ĉi helpo estas sub licenco CC-BY-SA 3.0
+<link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Tiu ĉi helpo estas skribita kun helpo de <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> kreita per <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>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/DrakX.xml b/docs/docs/stable/installer/eo/DrakX.xml
index c9ab92e3..2da4c4e5 100644
--- a/docs/docs/stable/installer/eo/DrakX.xml
+++ b/docs/docs/stable/installer/eo/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="eo" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="eo" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Instalado per DrakX-o</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Instalado per DrakX-o</title>
 
     <cover>
       <para><note>
@@ -33,18 +71,6 @@ Team</link>, if you would like to help improve this manual.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -59,23 +85,28 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -85,7 +116,10 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -93,19 +127,25 @@ Team</link>, if you would like to help improve this manual.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -113,11 +153,15 @@ Team</link>, if you would like to help improve this manual.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -136,4 +180,4 @@ Team</link>, if you would like to help improve this manual.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/eo/SelectAndUseISOs2.xml b/docs/docs/stable/installer/eo/SelectAndUseISOs2.xml
index a25ee334..1e71f1c6 100644
--- a/docs/docs/stable/installer/eo/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/eo/SelectAndUseISOs2.xml
@@ -1,39 +1,74 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="eo" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
   </info>
   <section>
     <title>Introduction</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
-which image match your needs.</para>
-    <para>There is two families of media:</para>
+which image best suits your needs.</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: After booting the media, it will follow a process
-allowing to choose what to install and how to configure your target
-system. This give you the maximal flexibility for a customized installation,
-in particular to choose which Desktop Environment you will install.</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
       </listitem>
       <listitem>
-        <para>LIVE media: you can boot the media in a real Mageia system without
-installing it, to see what you will get after installation.  The
-installation process is simpler, but you get lesser choices.</para>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Details are given in the next sections.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Media</title>
     <section>
       <title>Definition</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support the ISO
-file is copied to.</para>
-      <para>You can find them <link
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
+      <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
     <section>
@@ -42,23 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the traditional installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
-            <para>They are able to make a clean install or an update from previous releases.</para>
+            <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 or 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Some tools are available in the Welcome screen: Rescue System, Memory Test,
-Hardware Detection Tool.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Each DVD contains many available desktop environments and languages.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>You'll be given the choice during the installation to add non free software.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -69,22 +106,20 @@ Hardware Detection Tool.</para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>Can be used to preview the distribution without installing it on a HDD, and
-optionally install Mageia on to your HDD.</para>
+            <para>Can be used to preview the Mageia operating system without having to install
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 or 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade from previous
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>They contain non free software.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -92,13 +127,13 @@ releases.</emphasis></para>
         <title>Live DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Plasma desktop environment only.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -106,13 +141,13 @@ releases.</emphasis></para>
         <title>Live DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>GNOME desktop environment only.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -120,39 +155,27 @@ releases.</emphasis></para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Xfce desktop environment only.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 or 64 bit architectures.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
     </section>
     <section>
-      <title>Boot-only CD media</title>
+      <title>Net install media</title>
       <section>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>Each one is a small image that contains no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient when
-bandwidth is too low to download a full DVD, a PC without a DVD drive or a
-PC that can't boot from a USB stick.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 or 64 bit architectures.</para>
-          </listitem>
-          <listitem>
-            <para>English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -160,8 +183,8 @@ PC that can't boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -169,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains non-free software (mostly drivers, codecs...) for people who need
-it.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -181,62 +203,88 @@ it.</para>
     <section>
       <title>Downloading</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
-BitTorrent. In both cases, a window gives you some information, such as the
-mirror in use and an opportunity to change if the bandwidth is to low. If
-http is chosen, you may also see something like</para>
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
-them. Keep one of them <link linkend="integrity">for further
-usage</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Check the radio button Save File.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
-      <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
-file to be downloaded. When you ask these algorithms to recalculate this
-number from your downloaded file, either you have the same number and your
-downloaded file is correct, or the number is different and you have a
-failure. A failure infers that you should retry the download or attempt a
-repair using BitTorrent.</para>
-      <para>Open a console, no need to be root, and:</para>
-      <para>- To use md5sum, type: [sam@localhost]$ <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
-      <para>- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum
-path/to/the/image/file.iso</userinput>.</para>
-      <para>and compare the obtained number on your computer (you may have to wait for a
-while) with the number given by Mageia. Example:</para>
+      <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
+      <para>To generate the checksum for your downloaded ISO, open a console, (no need
+to be root), and:</para>
+      <itemizedlist>
+        <listitem>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+        <listitem>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+      </itemizedlist>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para/>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Burn or dump the ISO</title>
-    <para>The checked ISO can now be burned to a CD or DVD or dumped to a USB
-stick. These operations are not a simple copy and aim to make a bootable
-medium.</para>
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
     <section>
       <title>Burning the ISO to a CD/DVD</title>
-      <para>Use whatever burner you wish but ensure the burning device is set correctly
-to <emphasis role="bold">burn an image</emphasis>, burn data or files is not
-correct. There is more information in <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
-wiki</link>.</para>
+wiki</link> for more information.</para>
     </section>
     <section>
       <title>Dump the ISO to a USB stick</title>
-      <para>All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick
-and then use it to boot and install the system.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any other data will be lost and the partition capacity will be
-reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>To recover the original capacity, you must redo partitioning and re-format
-the USB stick.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Using a graphical tool within Mageia</title>
         <para>You can use a graphical tool like <link
@@ -245,40 +293,51 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
       <section>
         <title>Using a graphical tool within Windows</title>
         <para>You could try:</para>
-        <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
-        <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
+        <itemizedlist>
+          <listitem>
+            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
+          </listitem>
+          <listitem>
+            <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
+Imager</link></para>
+          </listitem>
+        </itemizedlist>
       </section>
       <section>
-        <title>Using Command line within a GNU/Linux system</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
-          <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
-disc partition if you get the device-ID wrong.</para>
+          <para>It is potentially *dangerous* to do this by hand. You risk overwriting
+potentially valuable existing data if you specify the wrong target device.</para>
         </warning>
-        <para>You can also use the dd tool in a console:</para>
         <orderedlist>
           <listitem>
             <para>Open a console</para>
           </listitem>
           <listitem>
-            <para>Become root with the command <userinput>su -</userinput> (don't forget the
-final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Plug in your USB stick (do not mount it, this also means do not open any
-application or file manager that could access or read it)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Enter the command <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
-            <para>Alternatively, you can get the device name with the command
-<code>dmesg</code>: at end, you see the device name starting with
-<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
-            <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
+          </listitem>
+          <listitem>
+            <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+            <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
+            <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
 [72594.770536] usb 1-1: Product: Mass Storage Device
@@ -295,24 +354,28 @@ application or file manager that could access or read it)</para>
 [72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
 [72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
 [72595.967251]  <emphasis>sdd</emphasis>: sdd1
-[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
-          </listitem>
-          <listitem>
-            <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX
-bs=1M</userinput></para>
-            <para>Where X=your device name eg: /dev/sdc</para>
-            <para>Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
-of=/dev/sdb bs=1M</userinput></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
+            <tip>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
+            </tip>
           </listitem>
           <listitem>
-            <para>Enter the command: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
-            <para>Unplug your USB stick, it is done</para>
+            <para>This is the end of the process, and you may now unplug your USB stick.</para>
           </listitem>
         </orderedlist>
       </section>
diff --git a/docs/docs/stable/installer/eo/acceptLicense.xml b/docs/docs/stable/installer/eo/acceptLicense.xml
index a5783d56..19a172cb 100644
--- a/docs/docs/stable/installer/eo/acceptLicense.xml
+++ b/docs/docs/stable/installer/eo/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,34 +37,44 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Licenco kaj publikig-notoj</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
-revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
-</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
-revision="5" align="center" condition="live" format="PNG"
-fileref="live-license.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="acceptLicense-im1" fileref="dx2-license.png" align="center"
+revision="4"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-license.png" xml:id="acceptLicense-im2" revision="5"
+align="center" condition="live"/> </imageobject></mediaobject>
 
   <section xml:id="license">
     <info>
       <title xml:id="license-ti1">Licenco</title>
     </info>
 
-    <para>Antaŭ ol instali <application>Magejon</application>, bv. legi la licencon
-zorgeme.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Ĉi tiuj kondiĉoj aplikiĝas al la tuta distribuaĵo
-<application>Magejo</application> kaj devas esti akceptataj antaŭ ol daŭrigi
-la instaladon.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Por akcepti nur selektu <guilabel>Akceptu</guilabel> kaj klaku sur
-<guibutton>Sekvanta</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Se vi decidas ne akcepti tiujn kondiĉojn, tiam ni dankas vin pro via
-rigardo. Klakante sur <guibutton>Ĉesu</guibutton> vi reŝarĝos vian
-komputilon.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -76,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Por vidi kio estas nova en ĉi tiu versio de
-<application>Magejo</application>, klaku sur la butono
-<guibutton>Publikig-notoj (Release Notes)</guibutton>.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/addUser.xml b/docs/docs/stable/installer/eo/addUser.xml
index a3ae4c7a..cbf45996 100644
--- a/docs/docs/stable/installer/eo/addUser.xml
+++ b/docs/docs/stable/installer/eo/addUser.xml
@@ -1,107 +1,134 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="eo" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Uzula kaj superuzula administrado</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
+
   
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Kreo de mastrumanta pasvorto (Set administrator (root) password):</title>
     </info>
-    <para>Estas konsilinde por ĉiuj instaloj de <application>Magejo</application> krei
-superuzulan pasvorton, kutime nomita la <emphasis>mastrumanta (root)
-pasvorto</emphasis> en Linukso. Kiam vi tajpos pasvorton en la supra skatolo
-ĝia koloro ŝanĝiĝos el ruĝa al flava kaj verda dependante de la forto de la
-pasvorto. Verda kampo signifas ke vi estas uzanta fortan pasvorton. Vi devas
-retajpi la saman pasvorton en la plisuba skatolo, tio certigos ke vi ne
-mistajpis la unuan pasvorton dank'al komparo inter ambaŭ.</para>
+
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
+
     <note xml:id="givePassword">
-      <para>En ĉiuj pasvortoj diferenciĝas inter majuskloj kaj minuskloj, estas pli bone
-utiligi miksaĵon de literoj (majusklaj kaj minusklaj), nombroj kaj aliaj
-karaktroj en pasvorto.</para>
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
+
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Enigo de uzulo (Enter a user)</title>
     </info>
-    <para>Aldonu uzulon ĉi tie. Uzulo havas malpli da rajtoj ol la superuzulo (root),
-sed sufiĉajn por retumi, utiligi oficej-programojn aŭ ludi komputil-ludojn
-kaj por io ajn kion la averaĝa uzulo faras perkomputile</para>
+
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
+
     <itemizedlist>
       <listitem>
-        <para><guibutton>Piktogramo</guibutton>: se vi klakas sur ĉi tiu butono vi ŝanĝos
-la uzulan ikonon.</para>
+        <para><emphasis role="bold">Icon</emphasis></para>
+
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Vera nomo</guilabel>: Metu la uzulan realan nomon en ĉi tiu teksta
-skatolo.</para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Saluta nomo (login name)</guilabel>: Ĉi tie eniru la uzulan
-salutan nomon aŭ lasu ke drakx-o utiligu version de la uzula vera
-nomo. <emphasis>La saluta nomo diferencigas inter majuskloj kaj
-minuskloj.</emphasis></para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Pasvorto</guilabel>: En ĉi tiu teksta skatolo vi devus tajpi la
-uzulan pasvorton. Estas kampo je la fino de la teksto-skatolo indikanta la
-forton de la pasvorto. (Vidu ankaŭ <xref linkend="givePassword"/>)</para>
-      </listitem>
-      <listitem>
-        <para><guilabel>Pasvorto (denove)</guilabel>: Retajpu la uzulan pasvorton en ĉi
-tiu teksta skatolo kaj darkx kontrolos ĉu la pasvorto estas la sama en ĉiuj
-uzulaj pasvortaj teksto-skatoloj.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
+
     <note>
-      <para>Any user you add while installing Mageia, will have a both read and write
-protected home directory (umask=0027).</para>
-      <para>You can add all extra needed users in the <emphasis>Configuration -
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
+
+      <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
 management</emphasis>.</para>
+
       <para>The access permissions can also be changed after the install.</para>
     </note>
   </section>
-  <section xml:id="addUserAdvanced" condition="classical">
+
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Sperta uzulo-administrado</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
-    <para>Se la <guibutton>Progresinta</guibutton> butono estas klakita aperos ekrano
-ebliganta eldoni la konfiguron de la aldonata uzulo.</para>
-    <para condition="classical">Additionally, you can disable or enable a guest account.</para>
-    <warning condition="classical">
-      <para>Ĉio konservita de gasto uzanta defaŭltan <emphasis>rbash-an</emphasis>
-gastan konton en la dosierujo /home estos forigita post la elsaluto.  La
-gasto devus konservi gravajn dosierojn en USB-ŝlosilo.</para>
-    </warning>
+
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
+
     <itemizedlist>
-      <listitem condition="classical">
-        <para><guilabel>Aktivigi gastan konton (Enable guest account)</guilabel>: Ĉi tie
-vi povas aktivigi aŭ malaktivigi gastan konton. Gasta konto ebligos gaston
-ensaluti kaj uzi la komputilon, sed ĝi havas pli da limigoj ol tiu de
-normalaj uzuloj.</para>
-      </listitem>
       <listitem>
-        <para><guilabel>Ŝelo</guilabel>: Ĉi tio vidigos liston ebligantan ŝanĝi la
-"shell"-on uzatan de la uzulo aldonita en la antaŭa ekrano. Oni povas elekti
-Bash-on, Dash-on kaj Sh-on</para>
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Uzula ID</guilabel>: Ĉi tie vi povas starigi uzulan identigilon
-por la uzulo aldonita en la antaŭa ekrano. La identigilo estas nombro.  Lasu
-ĝin malplena se vi ne scias kion fari.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Grupa ID</guilabel>: Ĉi tio ebligas vin starigi grupan
-identigilon.  Ankaŭ temas pri nombro, kutime la sama kiel tiu de la
-uzulo. Lasu ĝin malplena se vi ne scias kion fari.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eo/add_supplemental_media.xml b/docs/docs/stable/installer/eo/add_supplemental_media.xml
index facf4f92..9638c636 100644
--- a/docs/docs/stable/installer/eo/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/eo/add_supplemental_media.xml
@@ -1,55 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xml:id="add_supplemental_media"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="eo">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Selekto de datumportilo (Konfiguru aldonaj instal-datumportiloj)</title>
-    </info>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
+  </info>
 
   
+
+  
+
+  
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
-<imageobject> <imagedata align="center"
-fileref="dx2-add_supplemental_media.png" format="PNG" revision="1"
-xml:id="dx2-add_supplemental_media-im1"/> </imageobject></mediaobject>
-
-  <para>This screen gives you the list of already recognized repositories. You can
-add other sources for packages, like an optical disc or a remote source. The
-source selection determines which packages will be available for selection
-during the next steps.</para>
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
+<imageobject> <imagedata format="PNG"
+fileref="dx2-add_supplemental_media.png"
+xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Por interreta datumportilo sekvighos per du pashoj:</para>
 
   <orderedlist>
     <listitem>
-      <para>Selekti kaj aktivigi de retkonekto, se jam ne estas enshaltita </para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
       <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
 mirror, you have access to the selection of all repositories managed by
-Mageia, like the Nonfree , the Tainted repositories and the Updates. With
-the URL, you can designate a specific repository or your own NFS
-installation.</para>
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
-    <note>
-      <para>If you are updating a 64 bit installation which may contain some 32 bit
+  <note>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
 packages, it is advised to use this screen to add an online mirror by
-ticking one of the Network protocols here. The 64 bit DVD iso only contains
-64 bit and noarch packages, it will not be able to update the 32 bit
-packages. However, after adding an online mirror, installer will find the
-needed 32 bit packages there.</para>
-     </note>
-
-</section>
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/ask_mntpoint_s.xml b/docs/docs/stable/installer/eo/ask_mntpoint_s.xml
index 03c34df5..8600755c 100644
--- a/docs/docs/stable/installer/eo/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/eo/ask_mntpoint_s.xml
@@ -1,27 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="ask_mntpoint_s" version="5.0" xml:lang="eo">
-
+<section version="5.0" xml:lang="eo" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Elekti surmetingojn</title>
   </info>
 
   
+
   
+
   
+
   
+
+  
+
+  
+
   
+
   
+
   
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -33,56 +44,55 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
-xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-chooseMountpoints.png" align="center" format="PNG"
-xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
-
-  <para>Ĉi tie vi vidas la linuksajn subdiskojn kiuj estis trovitaj en via
-komputilo. Se vi ne akordas kun la sugestoj de
-<application>DrakX</application> vi povas ŝanĝi la surmetingojn.</para>
-
-  <note>
-    <para>Se vi ŝanĝas ion, certiĝu pri tio ke vi daŭre havas <literal>/</literal>
-(radikan) subdiskon.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
 
-  <itemizedlist>
-    <listitem>
-      <para>Ĉiu subdisko estas montrita tiel: "Aparato" ("Kapablo", "Surmetingo",
-"Speco").</para>
-    </listitem>
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
+  <itemizedlist>
     <listitem>
-      <para>"Aparato", konsistas el: "fiksita disko", ["fiksita diska litero"],
-"subdiska nombro" (ekzemple, "sda5").</para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
-    
     <listitem>
-      <para>Se vi havas multajn subdiskojn, vi povas elekti multajn malsamajn
-surmetingojn per la faldebla menuo, kiel <literal>/</literal>,
-<literal>/home</literal> kaj <literal>/var</literal>. Vi povas ankaŭ fari
-viajn proprajn surmetingojn kiel <literal>/video</literal> por subdisko kie
-vi volas konservi viajn filmojn, aŭ <literal>/cauldron-home</literal> por la
-<literal>/home</literal> subdisko de kaldrona instalo.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
-      <para>En kazoj de subdiskoj al kiuj vi ne volas aliri vi povas lasi la surmetingan
-kampon malplena.</para>
+      <para>For any partitions that you don't need to make use of, you can leave the
+mount point field blank.</para>
     </listitem>
   </itemizedlist>
 
   <warning>
-    <para>Klaku sur <guibutton>Antaŭa</guibutton> se vi ne scias kion elekti, kaj tiam
-aktivigu <guilabel>Agordi subdiskon</guilabel>. En la aperonta ekrano, vi
-povas klaki sur konkreta subdisko por vidi ĝian specon kaj grandon.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Se vi certas pri tio ke la surmetingoj estas ĝustaj, klaku sur
-<guibutton>Sekvanta</guibutton>, kaj elektu ĉu vi nur volas strukturi la
-subdisko(j)n kiu(j)n sugestas DrakX aŭ pli da ili.</para>
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
 </section>
diff --git a/docs/docs/stable/installer/eo/bestTime.xml b/docs/docs/stable/installer/eo/bestTime.xml
index bf18e542..24eedfa7 100644
--- a/docs/docs/stable/installer/eo/bestTime.xml
+++ b/docs/docs/stable/installer/eo/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="eo" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Clock settings</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>In this step, you have to select on which time your internal clock is set,
-either local time or UTC time.</para>
-
-  <para>In advanced tab, you will find more options about clock settings.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/bootLive.xml b/docs/docs/stable/installer/eo/bootLive.xml
index cc964324..544dcea9 100644
--- a/docs/docs/stable/installer/eo/bootLive.xml
+++ b/docs/docs/stable/installer/eo/bootLive.xml
@@ -1,29 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="eo"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
-DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
-bootloader to launch the installation automatically after rebooting the
-computer. If that does not happen you may need to reconfigure your BIOS or
-press one key that will offer you to choose the peripheral from which the
-computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
-ISO. According to your BIOS settings, the computer boots perhaps directly on
-the USB device already plugged in a port. If that does not happen you may
-need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
-or USB stick) without writing anything on the disk, so expect a very slow
-system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
-when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
-the inserted installation medium. Here, select other sources, like FTP or
-NFS servers. If the installation is carried out in a network with an SLP
-server, select one of the installation sources available on the server with
-this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
-optional disk with a driver update and will require its insertion during
-installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice)  or to
-process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
-duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para><para>In each case, the first steps will be the same to choose language, timezone
-and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Booting the medium</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>First screen while booting in BIOS mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">In UEFI mode</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/eo/chooseDesktop.xml b/docs/docs/stable/installer/eo/chooseDesktop.xml
index 2003ef97..c0af8e77 100644
--- a/docs/docs/stable/installer/eo/chooseDesktop.xml
+++ b/docs/docs/stable/installer/eo/chooseDesktop.xml
@@ -1,27 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Grafika medio</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Grafika medio</title>
   </info>
 
   
 
-  <para>Depende de viaj elektoj ĉi tie, povos aperi aliaj agordaj ekranoj.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>Post la selekto-paŝo(j), vi vidos glitan ekranon dum la pakaĵ-instalo.  La
-glitado povas esti malaktivigita premante la butonon
-<guilabel>Detaloj</guilabel></para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Elektu ĉu vi preferas uzi la labortablajn mediojn
-<application>KDE-on</application> aŭ
-<application>Gnome-on</application>. Ambaŭ venas kun kompleta aro da utilaj
-aplikaĵoj kaj iloj. Aktivigu <guilabel>Agordi</guilabel> se vi volas utiligi
-unu aŭ ambaŭ, aŭ se vi volas personigi la defaŭltajn program-elektojn de
-tiuj labortablaj medioj.  La labortablo <application>LXDE-o</application>
-estas pli malpeza ol la du antaŭaj.  Ĝi havas malpli da grafikaj uzulaj
-interfacoj kaj pakaĵoj instalitaj defaŭlte.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/eo/choosePackageGroups.xml b/docs/docs/stable/installer/eo/choosePackageGroups.xml
index ea3fa589..f1fc9c24 100644
--- a/docs/docs/stable/installer/eo/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/eo/choosePackageGroups.xml
@@ -1,39 +1,42 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Pakaĵaj grupoj</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
-  <para>Pakaĵoj estis arigitaj en grupoj por plifaciligi la elekton de tio kion vi
-bezonas en via sistemo. La grupoj estas sufiĉe memklarigaj, tamen plia
-informo pri la enhavo de ĉiu pakaĵaro estas disponebla kiam oni metas la
-musan montrilon sur ili.</para>
+  <para>Packages are arranged into common groups, to make choosing what you need on
+your system a lot easier. The groups are fairly self explanatory, however
+more information about the content of each is available in tool-tips which
+become visible as the mouse is hovered over them.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Laborstacio.</para>
+      <para><emphasis role="bold">Workstation</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Servilo.</para>
+      <para><emphasis role="bold">Server</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Grafika medio.</para>
+      <para><emphasis role="bold">Graphical Environment</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Elektado de individuaj pakaĵoj: vi povas uzi ĉi tiun elekton por aldoni aŭ
-forigi permane pakaĵojn.</para>
+      <para><emphasis role="bold">Individual Package Selection</emphasis>: you can use
+this option to manually add or remove packages</para>
     </listitem>
   </itemizedlist>
 
-  <para>Read <xref linkend="minimal-install"/> for instructions on how to do a
+  <para>See <xref linkend="minimal-install"/> for instructions on how to do a
 minimal install (without or with X &amp; IceWM).</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/choosePackagesTree.xml b/docs/docs/stable/installer/eo/choosePackagesTree.xml
index 62d6611f..ceab2080 100644
--- a/docs/docs/stable/installer/eo/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/eo/choosePackagesTree.xml
@@ -1,23 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="choosePackagesTree">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="eo">
+  <info>
+    <title xml:id="choosePackagesTree-ti1">Elekto de individuaj pakaĵoj</title>
+  </info>
 
-    <info>
-      <title xml:id="choosePackagesTree-ti1">Elekto de individuaj pakaĵoj</title>
-    </info>
+  
 
-    
+  
 
-<mediaobject>
-<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
-<imageobject> <imagedata fileref="dx2-choosePackagesTree.png" align="center"
-format="PNG" ></imagedata> </imageobject></mediaobject>
+  
 
-    <para>Ĉi tie vi povas elekti aŭ malelekti aldonajn pakaĵojn por agordi vian
-instalon.</para>
+  <mediaobject>
+<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
+align="center"/> </imageobject></mediaobject>
 
-    <para>Post fari vian elekton, vi povas klaki sur la <guibutton>disketa
-ikono</guibutton> sube en la paĝo por konservi vian pakaĵ-elekton (konservi
-en USB-ŝlosilo funkcias ankaŭ). Vi povos utiligi ĉi tiun dosieron por
-instali la samajn pakaĵojn en aliaj sistemo klakante sur la sama butono dum
-la instalado kaj elektante ŝarĝi ĝin.</para>
-  </section>
+  <para>Here you can add or remove any extra packages to customize your
+installation.</para>
 
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/configureServices.xml b/docs/docs/stable/installer/eo/configureServices.xml
index af564bfe..fa4b581c 100644
--- a/docs/docs/stable/installer/eo/configureServices.xml
+++ b/docs/docs/stable/installer/eo/configureServices.xml
@@ -1,39 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="configureServices" version="5.0" xml:lang="eo">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="eo" xml:id="configureServices">
+  <info>
+    <title xml:id="configureServices-ti1">Konfiguru viajn Servojn</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="configureServices-ti1">Konfiguru viajn Servojn</title>
-    </info>
+  
 
-    
-   
+  
 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureServices.png"
-align="center" format="PNG" xml:id="configureServices-im1"></imagedata>
-</imageobject></mediaobject>
-
-
-    <para revision="1" xml:id="configureServices-pa1">Ĉi tie vi povas decidi kiuj servoj (ne) devus esti lanĉitaj je la starto de
-la sistemo.</para>
-
-    <para revision="1" xml:id="configureServices-pa2">Estas kvar grupoj, klaku sur la triangulo kiu troviĝas antaŭ grupo por
-etendi ĝin kaj vidi ĉiujn servojn disponeblajn.</para>
-
-    <para revision="1" xml:id="configureServices-pa3">La elekto kiun faris DrakX estas kutime adekvata.</para>
-
-    <para revision="1" xml:id="configureServices-pa4">Se vi elektas servon, iu informo pri ĝi montriĝos en la suba skatolo.</para>
-
-    <para revision="1" xml:id="configureServices-pa5">Ŝanĝu aferojn nur se vi scias tre bone kion vi estas faranta.</para>
-  </section>
-
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
+xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
+
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Se vi elektas servon, iu informo pri ĝi montriĝos en la suba skatolo.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para xml:id="configureServices-pa5" revision="1">Ŝanĝu aferojn nur se vi scias tre bone kion vi estas faranta.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/configureTimezoneUTC.xml b/docs/docs/stable/installer/eo/configureTimezoneUTC.xml
index 6680322d..10f2e3a0 100644
--- a/docs/docs/stable/installer/eo/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/eo/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="configureTimezoneUTC">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="eo">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Konfiguru vian horzonon</title>
   </info>
@@ -7,20 +7,30 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject condition="classical"> <imagedata
-xml:id="configureTimezoneUTC-im1" revision="1"
-fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
-</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
-condition="live" format="PNG"/> </imageobject></mediaobject>
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="configureTimezoneUTC-im1" align="center"
+fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa1">Elektu vian horzonon selektante vian landon aŭ urbon proksiman kiu troviĝu
-en la sama tempo-zono.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa2">En la sekva ekrano vi povas alĝustigi vian sisteman horloĝon je la loka horo
-aŭ je GTM, ankaŭ konata kiel UTC.</para>
+  <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
+or to GMT, also known as UTC.</para>
 
   <note>
     <para revision="1" xml:id="configureTimezoneUTC-pa3">Se vi havas pli ol unu operacia sistemo en via komputilo, certiĝu pri tio ke
diff --git a/docs/docs/stable/installer/eo/configureX_card_list.xml b/docs/docs/stable/installer/eo/configureX_card_list.xml
index 2f317a99..e7f485d6 100644
--- a/docs/docs/stable/installer/eo/configureX_card_list.xml
+++ b/docs/docs/stable/installer/eo/configureX_card_list.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="configureX_card_list">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
@@ -6,20 +13,28 @@
   
 
   
+
+  
+
+  
+
   
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-xml:id="configureX_card_list-im1" fileref="dx2-configureX_card_list.png"
-format="PNG" /> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX has a very comprehensive database of video cards and will usually
 correctly identify your video device.</para>
@@ -27,33 +42,34 @@ correctly identify your video device.</para>
   <para>If the installer has not correctly detected your graphic card and you know
 which one you have, you can select it from the tree by: <itemizedlist>
       <listitem>
-        <para>vendor</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>then the name of your card</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>and the type of card</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-Xorg category</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>The Xorg listing provides more than 40 generic and open source video card
-drivers. If you still can't find a named driver for your card there is the
-option of using the vesa driver which provides basic capabilities.</para>
-
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the Commandline Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the Nonfree repository and in some cases only from
-the card manufacturers' websites.</para>
-
-  <para>The Nonfree repository needs to be explicitly enabled to access them.  If
-you didn't select it previously, you should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/eo/configureX_chooser.xml b/docs/docs/stable/installer/eo/configureX_chooser.xml
index 5a07631c..2964adb2 100644
--- a/docs/docs/stable/installer/eo/configureX_chooser.xml
+++ b/docs/docs/stable/installer/eo/configureX_chooser.xml
@@ -1,63 +1,92 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="eo">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Konfiguri X, grafik-karton kaj monitoron</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata revision="1" fileref="dx2-configureX_chooser.png"
-align="center" format="PNG" xml:id="configureX-im1"></imagedata>
-</imageobject></mediaobject>
-
-  <para revision="1" xml:id="configureX_chooser-pa1">Ne gravas kiun grafikan medion (ankaŭ konata kiel labortabla medio) vi
-elektis por ĉi tiu instalo de <application>Magejo</application>, ili ĉiuj
-baziĝas sur grafika uzula interfaco nomita <acronym>X Window
-System</acronym>, aŭ simple <acronym>X</acronym>. Do cele al bona funkciado
-de <acronym>KDE</acronym>, <acronym>GNOME</acronym>, <acronym>LXDE</acronym>
-aŭ iu alia grafika medio, la jena konfiguro de <acronym>X</acronym> devas
-esti ĝusta.  Elektu la ĝustan konfiguron se vi rimarkas ke
-<application>DrakX</application> ne elektis konfiguron aŭ vi pensas ke tiu
-elekto estas malĝusta.</para>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
+
+  <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis><guibutton>Grafik-karto </guibutton></emphasis>: Elektu vian
-karton en la listo se bezonate.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis><guibutton>Ekrano</guibutton></emphasis>: Vi povas elekti
-<guilabel>"Plug'n Play"</guilabel> siakaze aŭ elekti vian monitoron en la
-<guilabel>Vendista</guilabel> aŭ <guilabel>Ĝenerala</guilabel> listo. Elektu
-<guilabel>Akomodata</guilabel> se vi preferas permane starigi la
-horizontalan kaj vertikalan refreŝ-datumon de via monitoro.</para>
-
-      <warning>
-        <para revision="1" xml:id="configureX_chooser-pa3a">Malĝustaj refreŝ-datumoj povas damaĝi vian monitoron</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis><guibutton>Distingivo</guibutton></emphasis>: Starigu la deziratan
-distingivon kaj kolorprofundon de via monitoro ĉi tie.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis><guibutton>Testo</guibutton></emphasis>: La testo-butono ne ĉiam
-aperas dum la instalo. Se la butono estas tie, vi povas testi vian
-konfiguron premante ĝin. Se vi vidas demandon demandantan vin ĉu via
-konfiguro ĝustas, vi povas respondi "jes" kaj la konfiguro estos
-konservita. Se vi vidas nenion vi revenos al konfigur-ekrano kaj povos
-rekonfiguri ĉion ĝis kiam la testo sukcesos. <emphasis>Certiĝu pri tio ke
-via konfiguro estas ĝusta se la testo-butono ne estas disponebla</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis><guibutton>Opcioj</guibutton></emphasis>: Ĉi tie vi povas aktvigi
-aŭ malaktivigi kelkajn elektojn.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
 </section>
diff --git a/docs/docs/stable/installer/eo/configureX_monitor.xml b/docs/docs/stable/installer/eo/configureX_monitor.xml
index 7ef4904a..a16a2d78 100644
--- a/docs/docs/stable/installer/eo/configureX_monitor.xml
+++ b/docs/docs/stable/installer/eo/configureX_monitor.xml
@@ -14,11 +14,17 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
-<!-- lproof -->
+<!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
   </info>
 
@@ -26,58 +32,73 @@
 correctly identify yours.</para>
 
   <warning>
-    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis>Selecting a monitor with different characteristics could damage
-your monitor or video hardware. Please don't try something without knowing
-what you are doing.</emphasis> If in doubt you should consult your monitor
-documentation</para>
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
+could damage your monitor or video hardware. Please don't try something
+without knowing what you are doing.</emphasis> If in doubt you should
+consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
 format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa2"><emphasis>Custom</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Subdiskigo</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters, the vertical refresh
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
 rate and the horizontal sync rate. Vertical refresh determines how often the
 screen is refreshed and horizontal sync is the rate at which scan lines are
 displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
+        <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
 type with a sync range that is beyond the capabilities of your monitor: you
 may damage your monitor. If in doubt, choose a conservative setting and
 consult your monitor documentation.</para>
+      </listitem>
+    </varlistentry>
 
-  <para revision="1" xml:id="configureX_monitor-pa5"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and tries to determine the monitor type from the
-monitor database.</para>
-
-  <para revision="1"
-  xml:id="configureX_monitor-pa7"><emphasis>Vendor</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
-one you have, you can select it from the tree by selecting: <itemizedlist>
       <listitem>
-        <para>vendor</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>the monitor manufacturers name</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>the monitor description</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can select it from the tree by selecting:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa9"><emphasis>Generic</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para revision="1" xml:id="configureX_monitor-pa10">selecting this group displays nearly 30 display configurations such as
-1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the Vesa card driver
-when your video hardware cannot be determined automatically. Once again it
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
 may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 </section>
diff --git a/docs/docs/stable/installer/eo/diskPartitioning.xml b/docs/docs/stable/installer/eo/diskPartitioning.xml
new file mode 100644
index 00000000..77bcd2fe
--- /dev/null
+++ b/docs/docs/stable/installer/eo/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="eo" version="5.0" xml:lang="eo">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/diskdrake.xml b/docs/docs/stable/installer/eo/diskdrake.xml
index bff25c86..ad59994b 100644
--- a/docs/docs/stable/installer/eo/diskdrake.xml
+++ b/docs/docs/stable/installer/eo/diskdrake.xml
@@ -1,49 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" 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" version="5.0" xml:lang="eo" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Agordi subdiskon per DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
+
   <warning>
-    <para revision="3" xml:id="diskdrake-pa1">Se vi volas utiligi ĉifradon en via subdisko <literal>/</literal> vi devas
-havi apartan subdiskon <literal>/boot</literal>.  La ĉifrada elekto por la
-subdisko <literal>/boot</literal> ne devas esti selektita, alie via sistemo
-ne startos.</para>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
   </warning>
-  <para xml:id="diskdrake-pa3" revision="2">Agordu via(j)n disko(j)n ĉi tie. Vi povas forigi aŭ krei subdiskojn, ŝanĝi
-la dosiersistemon de subdisko aŭ ŝanĝi ĝian grandon kaj eĉ vidi kio estas en
-ĝi antaŭ ol komenci.</para>
-  <para xml:id="diskdrake-pa4" revision="1">Estas langeto por ĉiu trovita fiksita disko aŭ alispeca stor-aparato kiel
-USB-ŝlosilo. Ekzemple sda, sdb kaj sdc se estas tri. </para>
-  <para xml:id="diskdrake-pa5" revision="1">Premu <guibutton>Forviŝu ĉion</guibutton> por forigi ĉiujn subdiskojn en la
-elektita stor-aparato</para>
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert
-mode</guibutton>) gives some more tools like to add a label or to choose a
-partition type. </para>
-  <para xml:id="diskdrake-pa6a" revision="1">Daŭrigu ĝis kiam vi agordos ĉion laŭ via deziro.</para>
-  <para xml:id="diskdrake-pa7" revision="1">Klaku sur <guibutton>Finata</guibutton> kiam vi estos preta.</para>
-  <note>
-    <para>If you are installing Mageia on an UEFI system, check that an ESP (EFI
-System Partition) is present and correctly mounted on /boot/EFI (see below)</para>
-    <para><mediaobject><imageobject condition="classical"><imagedata fileref="dx2-diskdrake2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-align="center" fileref="live-diskdrake2.png"/></imageobject></mediaobject></para>
-  </note>
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
-    <mediaobject>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
+
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
+
+  <figure>
+    <title>EFI System Partition</title>
+
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
+
+  <figure>
+    <title>BIOS boot partition</title>
+
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/eo/doPartitionDisks.xml b/docs/docs/stable/installer/eo/doPartitionDisks.xml
index 1bfa26a5..a465f50d 100644
--- a/docs/docs/stable/installer/eo/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/eo/doPartitionDisks.xml
@@ -1,81 +1,214 @@
-<?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:lang="eo" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+
   
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
 
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Kreo de subdiskoj</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
-  <para xml:id="doPartitionDisks-pa1" revision="1">En tiu ĉi ekrano vi povas vidi la enhavon de via(j) stor-aparato(j) kaj la
-loko-proponon de DrakX por la instalo de <application>Magejo</application>.</para>
-  <para xml:id="doPartitionDisks-pa2" revision="1">La disponeblaj elektoj en la suba listo varios depende de la trajtoj kaj
-enhavo de via konkreta(j)  stor-aparato(j).</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist><listitem><para revision="1" xml:id="doPartitionDisks-pa4">Uzu ekzistantajn subdiskojn</para><para xml:id="doPartitionDisks-pa5" revision="1">Se tiu elekto estas disponebla oni trovis linuks-akordigeblajn subdiskojn
-kiuj povas esti utiligataj por la instalo.</para></listitem><listitem><para xml:id="doPartitionDisks-pa6" revision="1">Uzu liberan spacon</para><para xml:id="doPartitionDisks-pa7" revision="1">Se vi havas neuzitan spacon en via fiksita disko ĉi tiu elekto uzos ĝin por
-nova Mageja instalo.</para></listitem><listitem><para xml:id="doPartitionDisks-pa8" revision="1">Uzu la liberan spacon de vindoza subdisko</para><para xml:id="doPartitionDisks-pa9" revision="1">Se vi havas neuzitan spacon en ekzistanta vindoza subdisko, la instalilo
-povas proponi utiligi ĝin.</para><para xml:id="doPartitionDisks-pa10" revision="2">Ĉi tio povas esti utila maniero atingi spacon por via nova Mageja instalo,
-sed temas pri riska operacio do vi devus fari sekurec-kopion de ĉiuj gravaj
-dosieroj antaŭe!</para><para revision="3" xml:id="doPartitionDisks-pa11">Rimarku ke ĉi tio implikas la ŝrumpigon de la vindoza subdisko. La subdisko
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa5">Se tiu elekto estas disponebla oni trovis linuks-akordigeblajn subdiskojn
+kiuj povas esti utiligataj por la instalo.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa7">Se vi havas neuzitan spacon en via fiksita disko ĉi tiu elekto uzos ĝin por
+nova Mageja instalo.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
+
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
+
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">Rimarku ke ĉi tio implikas la ŝrumpigon de la vindoza subdisko. La subdisko
 devas esti "pura", tio estas Vindozo devis fermiĝi senprobleme la lastan
 fojon kiam ĝi estis uzita. Ĝi ankaŭ devas esti malfragmentiĝita kvankam tio
 ne estas garantio pri tio ke ĉiuj dosieroj en la subdisko estis movitaj el
 la areo uzota. Estas ege rekomendinde realigi sekurec-kopion de viaj
-personaj dosieroj.</para><para>With this option, the installer displays the remaining Windows partition in
-light blue and the future Mageia partition in dark blue with their intended
-sizes just under. You have the possibility to adapt these sizes by clicking
-and dragging the gap between both partitions. See the screen-shot below.</para><mediaobject><imageobject condition="classical"><imagedata
-fileref="dx2-doPartitionDisks2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-fileref="live-doPartitionDisks2.png" align="center"/></imageobject></mediaobject></listitem></itemizedlist> <itemizedlist><listitem><para xml:id="doPartitionDisks-pa12" revision="1">Forviŝu kaj uzu la tutan diskon.</para><para xml:id="doPartitionDisks-pa13" revision="1">Ĉi tiu elekto utiligos la tutan diskon por Magejo.</para><para xml:id="doPartitionDisks-pa14" revision="1">Atentu! Ĉi tio forigos ĈIUJN datumojn en la elektita fiksita disko. Estu
-zorgema!</para><para xml:id="doPartitionDisks-pa15" revision="1">Se vi volas uzi parton de la disko por alia celo aŭ vi havas datumojn en la
-disko kiujn vi ne volas perdi, ne elektu ĉi tion.</para></listitem></itemizedlist><itemizedlist><listitem><para xml:id="doPartitionDisks-pa16" revision="1">Custom disk partitioning</para><para xml:id="doPartitionDisks-pa17" revision="1">Ĉi tio havigas al vi plenan kontrolon sur la lokigo de la instalo en via(j)
-fiksita(j)  disko(j).</para></listitem></itemizedlist></para>
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
-  <para>The installer will share the available place out according to the following
-rules:</para>
-  <para><itemizedlist><listitem><para>If the total available place is lower than 50 GB, only one partition is
-created for /, there is no separate partition for /home.</para></listitem><listitem><para>If the total available place is over 50 GB, then three partitions are
-created</para><itemizedlist><listitem><para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para></listitem><listitem><para>1/19 is allocated to swap with a maximum of 4 GB</para></listitem><listitem><para>the rest (at least 12/19) is allocated to /home</para></listitem></itemizedlist></listitem></itemizedlist></para>
-  <para>That means that from 160 GB and over of available place, the installer will
-create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.</para>
+personaj dosieroj.</para>
+      </important>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa17">Ĉi tio havigas al vi plenan kontrolon sur la lokigo de la instalo en via(j)
+fiksita(j)  disko(j).</para>
+    </listitem>
+  </itemizedlist>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
+
   <note>
-    <para>If you are using an UEFI system, the ESP (EFI System Partition) will be
-automatically detected, or created if it does not exist yet, and mounted on
-/boot/EFI. The "Custom disk partitioning" option is the only one that allows
-to check it has been correctly done</para>
+    <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
-  <note>
-    <para>If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk,
-you need to create a Bios boot partition if not already existing. It is an
-about 1 MiB partition with no mount point. Choose <xref
-linkend="diskdrake"/> to be able to create it with the Installer like any
-other partition, just select BIOS boot partition as filesystem type.</para>
-    <mediaobject>
+
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
-  <warning>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
+
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
-previous standard of 512 byte logical sectors. Due to lack of available
-hardware, the partitioning tool used in the installer has not been tested
-with such a drive. Also some ssd drives now use an erase block size over 1
-MB. We suggest to pre-partition the drive, using an alternative partitioning
-tool like gparted, if you own such a device, and to use the following
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
 settings:</para>
-    <para>"Align to" "MiB"</para>
-    <para>"Free space preceding (MiB)" "2"</para>
-    <para>Also make sure all partitions are created with an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Also make sure all partitions are created using an even number of megabytes.</para>
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/eo/exitInstall.xml b/docs/docs/stable/installer/eo/exitInstall.xml
index 5d234550..5ac0d0fb 100644
--- a/docs/docs/stable/installer/eo/exitInstall.xml
+++ b/docs/docs/stable/installer/eo/exitInstall.xml
@@ -1,18 +1,32 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xml:id="exitInstall" version="5.0" xml:lang="eo">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0" xml:lang="eo">
   <info>
     <title xml:id="exitInstall-ti1">Gratulon</title>
   </info>
+
   
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
-  <para xml:id="exitInstall-pa1" revision="2">Finiĝis la instalado kaj konfigurado de <application>Magejo</application>
-kaj nun vi povas sekure eltiri la instal-medion kaj reŝarĝi vian komputilon.</para>
-  <para xml:id="exitInstall-pa2" revision="2">Post tiu reŝarĝo, en la ŝarĝila ekrano vi povos elekti kiun operacian
-sistemon lanĉi (se vi havas pli ol unu).</para>
+
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
+
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
+
   <para xml:id="exitInstall-pa3" revision="1">Se vi ne ŝanĝis la preferojn de la ŝarĝilo, Magejo estos aŭtomate elektita
 kaj ŝarĝita.</para>
+
   <para xml:id="exitInstall-pa4" revision="1">Ĝuu!</para>
-  <para xml:id="exitInstall-pa5" revision="1">Vizitu www.mageia.org se vi havas demandojn aŭ volas kontribui al Magejo</para>
+
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/firewall.xml b/docs/docs/stable/installer/eo/firewall.xml
index 31d4d02f..000b3001 100644
--- a/docs/docs/stable/installer/eo/firewall.xml
+++ b/docs/docs/stable/installer/eo/firewall.xml
@@ -1,33 +1,37 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="eo">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="eo" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Firewall</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Firewall</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows to configure some simple firewall rules: they determine
-which type of message from the Internet will be accepted by the target
-system. This, in turn, allows the corresponding services on the system to be
-accessible from the Internet.</para>
+  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+determine which type of message from the Internet will be accepted by the
+target system. This, in turn, allows the corresponding services on the
+system to be accessible from the Internet.</para>
 
-  <para>In the default setting, no button is checked - no service of the system is
-accessibly from the network. The "<emphasis>Everything (no
-firewall)</emphasis>" button has a particular role: it enables access to all
-services of the machine - an option that does not make much sense in the
-context of the installer since it would create a totally unprotected
-system.  Its veritable use is in the context of the Mageia Control Center
-(which uses the same GUI layout) for temporarily disabling the entire set of
-firewall rules for testing and debugging purposes.</para>
+  <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
 
-  <para>All other checkbuttons are more or less self-explanatory. As an example, you
-will check the "CUPS server" button if you want printers on your machine to
-be accessible from the network.</para>
+  <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The set of checkbuttons only comprises the most common services. The
-"Advanced" button allows to enable messages that correspond to a service for
-which no checkbutton exists. The "<emphasis>Advanced</emphasis>" button
-opens a window where you can enable a series of services by typing a list of
-couples (blank separated)</para>
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
 
diff --git a/docs/docs/stable/installer/eo/formatPartitions.xml b/docs/docs/stable/installer/eo/formatPartitions.xml
index 775dfa99..eba87a4c 100644
--- a/docs/docs/stable/installer/eo/formatPartitions.xml
+++ b/docs/docs/stable/installer/eo/formatPartitions.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="formatPartitions">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Strukturi subdiskojn</title>
   </info>
@@ -7,41 +13,41 @@
   
 
   
+
   
+
   
+
   
-  
-  
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-formatPartitions.png" format="PNG" align="center"
-xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-formatPartitions.png" format="PNG" align="center"
-xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="formatPartitions-pa1">Ĉi tie vi povas elekti kiu(j)n subdisko(j)n vi ŝatus strukturi. Iu ajn
-datumo en subdisko(j) <emphasis>ne</emphasis> markita(j) por strukturado
-estos savita.</para>
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
+partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa2">Kutime almenaŭ la subdiskoj elektitaj de DrakX bezonos strukturon</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa3">Klaku sur <guibutton>Progresinta</guibutton> por elekti subdiskojn kie vi
-ŝatus kontroli ĉu ekzistas <emphasis>difektitaj blokoj</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para revision="1" xml:id="formatPartitions-pa4">Se vi ne certas ĉu vi faris la ĝustan elekton, vi povas klaki sur
-<guibutton>Antaŭa</guibutton>, denove sur <guibutton>Antaŭa</guibutton> kaj
-tiam sur <guibutton>subdiskigo</guibutton> por reveni al la ĉefa ekrano.  En
-tiu ekrano vi havas elekton por vidi kio estas en viaj subdiskoj.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para revision="1" xml:id="formatPartitions-pa5">Se vi estas certa pri la elekto, klaku sur <guibutton>Sekvanta</guibutton>
-por daŭrigi.</para>
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
 </section>
diff --git a/docs/docs/stable/installer/eo/graphicalConfiguration.xml b/docs/docs/stable/installer/eo/graphicalConfiguration.xml
new file mode 100644
index 00000000..345e37c0
--- /dev/null
+++ b/docs/docs/stable/installer/eo/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/eo/installUpdates.xml b/docs/docs/stable/installer/eo/installUpdates.xml
index d7b8f9dc..a96fb4d2 100644
--- a/docs/docs/stable/installer/eo/installUpdates.xml
+++ b/docs/docs/stable/installer/eo/installUpdates.xml
@@ -1,31 +1,46 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="eo">
+  
 
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="installUpdates"><info><title xml:id="installUpdates-ti1">Ĝisdatigoj</title></info>
+  
 
+  
 
+  
 
+  
 
- 
- 
- 
+  
 
-   <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-installUpdates.png"
-width="800" depth="600" format="PNG" align="center"
-xml:id="installUpdates-im1"></imagedata> </imageobject></mediaobject> 
-
- <para revision="1" xml:id="installUpdates-pa1">Ekde la publikigo de ĉi tiu versio de <application>Magejo</application>,
-pluraj pakaĵoj estis probable ĝisdatigitaj aŭ plibonigitaj.</para>
-
-  <para revision="1" xml:id="installUpdates-pa2">Elektu <guilabel>jes</guilabel> se vi deziras elŝuti kaj instali ilin,
-elektu <guilabel>ne</guilabel> se vi ne volas fari tion nun aŭ se vi ne
-havas retaliron</para>
-
-  <para revision="1" xml:id="installUpdates-pa3">Klaku sur <guibutton>Sekvanta</guibutton> por daŭrigi</para>
-
-</section>
-  
\ No newline at end of file
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Ĝisdatigoj</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
+align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+    </listitem>
+
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/installer.xml b/docs/docs/stable/installer/eo/installer.xml
index e2b1c544..e7dc4af6 100644
--- a/docs/docs/stable/installer/eo/installer.xml
+++ b/docs/docs/stable/installer/eo/installer.xml
@@ -1,164 +1,168 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="installer">
-  <info>
-    <title xml:id="Select-and-use-ISOs-ti1">DrakX, la instalilo de Magejo</title>
-  </info>
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="installer"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
 
-  <para>Se vi estas nova aŭ nesperta uzulo de GNU/Linukso, la instalilo de Magejo
-estas desegnita por igi vian instaladon aŭ ĝisdatigon tiel facila kiel eble.</para>
+  
 
-  <para>La komenca menua ekrano havas plurajn elektojn, tamen defaŭlte lanĉiĝos la
-mageja instalilo, kiu kutime havos ĉion kion oni bezonas.</para>
+  
 
-  <section>
-    <title>Bonveniga instal-ekrano</title>
+  
 
-    <section>
-      <title>Using a Mageia DVD</title>
-
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-with an UEFI system and the second one with a Legacy system:</para>
-
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, you can access to options by pressing the "e" letter to
-enter the "edit mode". To come back to this screen, press either the key
-"esc" to quit without saving or press the key "Ctrl" or "F10" to quit with
-saving.</para>
-
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
+  
 
-      <para>From this screen, it is possible to set some personal preferences:<itemizedlist>
-          <listitem>
-            <para>The language (for the installation only, may be different that the chosen
-language for the system) by pressing the key F2 (Legacy mode only)</para>
+  
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
+  
 
-            <para>Use the arrow keys to select the language and press the key Enter.</para>
+  
 
-            <para>Here is for example, the French welcome screen when using a Live
-DVD/CD. Note that the Live DVD/CD menu does not propose: <guilabel>Rescue
-System</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware
-Detection Tool</guilabel>.</para>
+  
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome4fr.png"/> </imageobject></mediaobject>
-          </listitem>
+  
 
-          <listitem>
-            <para>Change the screen resolution by pressing the F3 key (Legacy mode only).</para>
+  <info>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, la instalilo de Magejo</title>
+  </info>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
+  <para>Se vi estas nova aŭ nesperta uzulo de GNU/Linukso, la instalilo de Magejo
+estas desegnita por igi vian instaladon aŭ ĝisdatigon tiel facila kiel eble.</para>
 
-          <listitem>
-            <para>Add some kernel options by pressing the <emphasis role="bold">F6</emphasis>
-key for the legacy mode or the <emphasis role="bold">e</emphasis> key for
-the UEFI mode.</para>
+  <section>
+    <title>La instal-paŝoj</title>
 
-            <para>If the installation fails, then it may be necessary to try again using one
-of the extra options. The menu called by F6 displays a new line called
-<guilabel>Boot options</guilabel> and propose four entries:</para>
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
-            <para>- Default, it doesn't alter anything in the default options.</para>
+  <section>
+    <title>Bonveniga instal-ekrano</title>
 
-            <para>- Default, it doesn't alter anything in the default options.</para>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-            <para>- No ACPI (Advanced Configuration and Power Interface), power management
-isn't taken into account.</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
 
-            <para>- No Local APIC (Local Advanced Programmable Interrupt Controller), it is
-about CPU interruptions, select this option if you are asked for.</para>
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
-            <para>When you select one of these entries, it modifies the default options
-displayed in the <guilabel>Boot Options</guilabel> line.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with the
-key F6 does not appear in the <guilabel>Boot Options</guilabel> line,
-however, they are really taken into account.</para>
-            </note>
+      <itemizedlist>
+        <title>Menu</title>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
 
-          <listitem>
-            <para>Add more kernel options by pressing the key F1 (Legacy mode only).</para>
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
 
-            <para>Pressing F1 opens a new window with more available options.  Select one with
-the arrow keys and press Enter to have more details or press the Esc key to
-go back to the welcome screen.</para>
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
 
-            <para>The detailed view about the option splash. Press Esc or select
-<guilabel>Return to Boot Options</guilabel> to go back to the options
-list. These options can by added by hand in the <guilabel>Boot
-options</guilabel> line.</para>
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
 
-            <note>
-              <para>The help is translated in the chosen language with the F2 key.</para>
-            </note>
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
 
-            <para>For more information about kernel options on legacy and UEFI systems, see:
-<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
 
     <section>
-      <title>Using a Wired Network</title>
+      <title>UEFI Systems</title>
 
-      <para>Here is the default welcome screen when using a Wired Network-based
-Installation CD (netinstall.iso or netinstall-nonfree.iso images):</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-      <para>It does not allow to change the language, the available options are
-described in the screen. For more information about using a Wired
-Network-based Installation CD, see <link
-ns2:href="https://wiki.mageia.org/en/Boot.iso_install">the Mageia
-Wiki</link></para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-      <warning>
-        <para>The keyboard layout is the American one.</para>
-      </warning>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="../dx-help.png"/> </imageobject></mediaobject>
-    </section>
-  </section>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
 
-  <section>
-    <title>La instal-paŝoj</title>
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
 
-    <para>La instal-procezo dividiĝas en serio da paŝoj, kiuj povas esti sekvataj per
-la flanka panelo de la ekrano.</para>
-
-    <para>Ĉiu paŝo havas unu aŭ pliajn ekranojn kiuj povas ankaŭ havi
-<guibutton>Progresintan</guibutton> butonon kun aldonaj sed malofte
-bezonataj elektoj.</para>
-
-    <para>La plimulto el ekranoj havas butonon pri <guibutton>Helpo</guibutton>
-havigantan pliajn karigojn pri tiu paŝo.</para>
-
-    <note>
-      <para>Se iam dum la instalado vi decidas haltigi ĝin, eblas reŝarĝi la komputilon,
-sed bv. pripensi tion dufoje antaŭe.  Post la formatigo de partigo aŭ post
-la ekinstalo de ĝisdatigo via komputilo ne plu restos egale, reŝarĝi ĝin
-povus igi vian sistemon neuzebla. Se malgraŭ tio vi estas certa pri tio ke
-vi volas reŝarĝi, malfermu teksto-terminalon premante la tri klavojn
-<guibutton>Alt Ctrl F2</guibutton> samtempe.  Post tio, premu <guibutton>Alt
-Ctrl Delete</guibutton> samtempe por reŝarĝi.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -169,18 +173,20 @@ Ctrl Delete</guibutton> samtempe por reŝarĝi.</para>
 
       <itemizedlist>
         <listitem>
-          <para>Post la komenca ekrano vi eble ne alvenos al la ekrano pri
-lingvo-selekto. Ĉi tio povas okazi kun kelkaj grafik-kartoj kaj malnovaj
-maŝinoj. Provu utiligi malaltan rezolucion per la tajpo de "vgalo" en la
-komand-linio.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this hit ESC at the first welcome screen and confirm with ENTER. You will be
-presented with a black screen with the word "boot:". Type "text" and hit
-ENTER. Now continue with the installation in text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -188,32 +194,31 @@ ENTER. Now continue with the installation in text mode.</para>
     <section>
       <title>Instal-paneoj</title>
 
-      <para>Se la sistemo ŝajnas panei dum la instalo, tio povas esti pro
-aparatar-detekta problemo. Ĉikaze la aŭtomata detektado de aparatoj povas
-esti prokrastita. Por provi tion tajpu <code>noauto</code> en la
-komando-linio. Ĉi tiu elekto povas ankaŭ esti miksita kun la antaŭa se estas
-necese.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
       <title>RAM problem</title>
 
-      <para>Ili estos malofte necesaj, sed en kelkaj kazoj la aparataro povas kalkuli la
-disponeblan ĉefmemoron malĝuste. Por konkretigi ĝin permane vi povas utiligi
-la parametron mem=xxxM, kie xxx estas la ĝusta kvanto da ĉefmemoro. Ekzemple
-"mem=256M" specifus 256MB-ojn el ĉefmemoro.</para>
+      <para>This will rarely be needed, but in some cases the hardware may report the
+available RAM incorrectly. To specify this manually, you can use the
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dynamic partitions</title>
 
-      <para>If you converted your hard disk from "basic" format to "dynamic" format on
-Microsoft Windows, you must know that it is impossible to install Mageia on
-this disc. To go back to a basic disk, see the Microsoft documentation:
-<link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
-
-  <section/>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eo/locale.xml b/docs/docs/stable/installer/eo/locale.xml
new file mode 100644
index 00000000..5c913a0f
--- /dev/null
+++ b/docs/docs/stable/installer/eo/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/eo/login.xml b/docs/docs/stable/installer/eo/login.xml
index d47e4324..31ce9923 100644
--- a/docs/docs/stable/installer/eo/login.xml
+++ b/docs/docs/stable/installer/eo/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="eo"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
-yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para><para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="eo">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/media_selection.xml b/docs/docs/stable/installer/eo/media_selection.xml
index e3f9c82a..9094d325 100644
--- a/docs/docs/stable/installer/eo/media_selection.xml
+++ b/docs/docs/stable/installer/eo/media_selection.xml
@@ -1,18 +1,31 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="eo">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Media Selection (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
+
   
+
   
+
   
 
-<mediaobject>
+  
+  
+  <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
 <imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
 format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
@@ -31,7 +44,7 @@ the base of the distribution.</para>
       <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
 free-of-charge, i.e. Mageia may redistribute them, but they contain
 closed-source software (hence the name - Nonfree). For example this
-repository includes nVidia and ATI graphics card proprietary drivers,
+repository includes nVidia and AMD graphics card proprietary drivers,
 firmware for various WiFi cards, etc.</para>
     </listitem>
 
@@ -39,8 +52,8 @@ firmware for various WiFi cards, etc.</para>
       <para>The <emphasis>Tainted</emphasis> repository includes packages released under
 a free license. The main criteria for placing packages in this repository is
 that they may infringe patents and copyright laws in some countries,
-e.g. Multimedia codecs needed to play various audio/video files; packages
-needed to play commercial video DVD, etc.</para>
+e.g. multimedia codecs needed to play various audio/video files; packages
+needed to play commercial video DVD's, etc.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eo/minimal-install.xml b/docs/docs/stable/installer/eo/minimal-install.xml
index 9d3e128d..a928e517 100644
--- a/docs/docs/stable/installer/eo/minimal-install.xml
+++ b/docs/docs/stable/installer/eo/minimal-install.xml
@@ -1,47 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xml:id="minimal-install"
-         xmlns="http://docbook.org/ns/docbook"
-	 xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="eo">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Minimuma instalo</title>
   </info>
 
   
+
+  
+
+  
+
+  
+
   
 
-  <para>Vi povas elekti Minimuman Instalon malselektante ĉion en la Pakaĵara Elekta
-ekrano, vidu <xref linkend="choosePackageGroups"></xref>.</para>
-  <para>If desired, you can additionally tick the "Individual package selection"
-option in the same screen.</para>
   <para>Minimal Installation is intended for those with specific uses in mind for
-their <application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the "Individual
-package selection" option mentioned above, to fine-tune your installation,
-see <xref linkend="choosePackagesTree"></xref>.</para>
-  <para>Se vi elektas ĉi tian instalon la venonta ekrano proponos al vi instali
-plurajn utilajn aldonaĵojn kiel dokumentojn aŭ Ikso-servilon.</para>
-  <para>If selected, "With X" will also include IceWM as lightweight desktop
-environment.</para>
-  <para>The basic documentation is provided in the form of man and info pages.  It
-contains the man pages from the <link
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
 Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
 coreutils</link> info pages.</para>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" fileref="dx2-minimal-install.png"
-align="center" format="PNG" xml:id="minimal-install-im1"></imagedata>
+<imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
+align="center" fileref="dx2-minimal-install.png" revision="1"/>
 </imageobject></mediaobject>
-
-  </section>
-
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/misc-params.xml b/docs/docs/stable/installer/eo/misc-params.xml
index 15c4b613..3349cecf 100644
--- a/docs/docs/stable/installer/eo/misc-params.xml
+++ b/docs/docs/stable/installer/eo/misc-params.xml
@@ -1,22 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Diversaj parametroj</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
-
-  <para xml:id="misc-params-pa1" revision="1">DrakX faris inteligentajn antaŭelektojn por la konfiguro de via sistemo
-dependante de tio kion vi elektis kaj la aparataro kiun ĝi mem eltrovis. Vi
-povas kontroli la konfigurojn ĉi tie kaj ŝanĝi ilin se vi volas klakante sur
-<guibutton>Konfiguru</guibutton>.</para>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+  <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
 
   <note>
-    <para>As a general rule, default settings are recommended and you can keep them
-with 3 exceptions:<itemizedlist>
+    <para>As a general rule, it is recommended that you accept the default settings
+unless:<itemizedlist>
         <listitem>
           <para>there are known issues with a default setting</para>
         </listitem>
@@ -26,7 +42,7 @@ with 3 exceptions:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>something else is said in the detailed sections below</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,47 +54,47 @@ with 3 exceptions:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Horzono</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX elektis tempo-zonon por vi, dependante de via preferata lingvo. Vi
-povas ŝanĝi ĝin se bezonate. Vidu ankaŭ <xref
-linkend="configureTimezoneUTC"></xref></para>
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Lando</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
-        <para xml:id="misc-params-system-pa3a" revision="1">Se vi ne troviĝas en la selektita lando, estas tre grave ke vi korektu ĝin.
-Vidu <xref linkend="selectCountry"></xref></para>
+        <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
+setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Startŝarĝilo</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX faris bonajn elektojn por la konfiguro de la sistema ŝarĝilo.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure Grub2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Por plia informo vidu <xref linkend="setupBootloader"></xref></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Uzula administrado (User management)</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Vi povas aldoni pliajn uzulojn ĉi tie. Ĉiuj havos sian propran dosierujon
-<literal>/home</literal>.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Servoj</guilabel>:</para>
-
-        <para xml:id="misc-params-system-pa6a" revision="1">Sistemaj servoj celas tiujn malgrandajn programojn funkciantajn fone
-(demonoj). Ĉi tiu ilo ebligos vin aktivigi aŭ malaktivigi diversajn taskojn.</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Vi devus kontroli zorgeme antaŭ ol ŝanĝi ion ĉi tie - eraro povus okazigi ke
-via komputilo ne funkciu ĝuste.</para>
+        <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
+(daemons).  This tool allows you to enable or disable certain processes.</para>
 
-        <para>For more information, see <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -90,10 +106,10 @@ via komputilo ne funkciu ĝuste.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Klavaro</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa1a" revision="1">Ĉi tie vi konfiguras aŭ ŝanĝas vian klavar-agordon kiu dependas de via
-lando, lingvo aŭ klavar-speco.</para>
+        <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
+of keyboard.</para>
 
         <note>
           <para>If you notice a wrong keyboard layout and want to change it, keep in mind
@@ -102,27 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Muso</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Ĉi tie vi povas aldoni aŭ konfiguri aliajn indikajn aparatojn, tabuletojn,
 mov-globojn, ktp.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Son-karto </guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver, if there is a default one. The option
-to select a different driver is only given when there is more than one
-driver for your card, but none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Grafika interfaco</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Ĉi tiu sekcio ebligas vin konfiguri vian grafik-karto(j)n kaj montrilo(j)n.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Por plia informo vidu <xref linkend="configureX_chooser"></xref>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -137,28 +158,28 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Reto</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
-        <para xml:id="misc-params-network-pa2" revision="1">Vi povas konfiguri vian reton ĉi tie, sed por ret-kartoj utiligantaj
-neliberajn pelilojn estas plibone fari tion post la reŝarĝo de la sistemo
-per <application>Mageja Konfigurilo </application>. Por tio vi devos
-aktivigi la neliberajn deponejojn.</para>
+        <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
+repositories.</para>
 
         <warning>
-          <para xml:id="misc-params-network-pa3" revision="1">Kiam vi aldonas ret-karton ne forgesu konfiguri vian fajronŝirmilon por ke
-ĝi kontrolu ankaŭ tiun ret-interfacon.</para>
+          <para xml:id="misc-params-network-pa3" revision="1">When you add a network card, do not forget to set your firewall to monitor
+that interface as well.</para>
         </warning>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Prokuraj serviloj</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">Prokura servilo funkcias kiel peranto inter via komputilo kaj interreto.  Ĉi
-tiu sekcio ebligas vin konfiguri vian komputilon por utiligi prokuran
-servon.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">Eble vi devas konsulti vian ret-mastrumanton por scii la parametrojn kiujn
-vi devas enigi ĉi tie</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -170,26 +191,31 @@ vi devas enigi ĉi tie</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Sekurec-nivelo </guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Ĉi tie vi starigas la sekurec-nivelon por via komputilo, en la plimulto el
-okazoj la defaŭlta konfiguro estas adekvata por ĝenerala uzo.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Aktivigu la elekton pli adekvatan laŭ viaj bezonoj.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Fajroŝirmilo (Fajromuro)</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">Fajroŝirmilo celas esti bariero inter viaj gravaj datumoj kaj la friponoj en
-la reto kiuj volas kompromiti aŭ forŝteli ilin.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Rimarku ke ebligi ĉion (sen fajroŝirmilo) povas esti tre riska.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/eo/reboot.xml b/docs/docs/stable/installer/eo/reboot.xml
index 0ec576ac..8015ff6c 100644
--- a/docs/docs/stable/installer/eo/reboot.xml
+++ b/docs/docs/stable/installer/eo/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="eo" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Reboot</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/eo/securityLevel.xml b/docs/docs/stable/installer/eo/securityLevel.xml
index 4b4eba1a..7f108dff 100644
--- a/docs/docs/stable/installer/eo/securityLevel.xml
+++ b/docs/docs/stable/installer/eo/securityLevel.xml
@@ -1,32 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="securityLevel" version="5.0" xml:lang="eo">
+<section version="5.0" xml:lang="eo" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="securityLevel-ti1">Sekurec-nivelo</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="securityLevel-ti1">Sekurec-nivelo</title>
-    </info>
+  
 
- 
- 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-securityLevel.png"
-align="center" format="PNG" xml:id="securityLevel-im1"></imagedata>
-</imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
-    <para revision="1" xml:id="securityLevel-pa1">Vi povas alĝustigi vian sekurec-nivelon ĉi tie.</para>
+  <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-    <para revision="1" xml:id="securityLevel-pa2">Lasu la defaŭltan konfiguron senŝanĝe se vi ne scias kion elekti.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
 
-    <para revision="2" xml:id="securityLevel-pa3">Post la instalo, ĉiam eblos alĝustigi la sekurec-konfiguron en la fako
-<guilabel>Sekureco</guilabel> en la Mageja Kontrolilo.</para>
-  </section>
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
+  <para><emphasis role="bold">Security Administrator</emphasis></para>
+
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
+send <emphasis>security alert messages</emphasis> when it detects situations
+which require notification to a system administrator.</para>
+
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
+
+  <note>
+    <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
+messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
+be configured for receiving such mail!</para>
+  </note>
+
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/eo/selectCountry.xml b/docs/docs/stable/installer/eo/selectCountry.xml
index 04c68b31..1fa0a06e 100644
--- a/docs/docs/stable/installer/eo/selectCountry.xml
+++ b/docs/docs/stable/installer/eo/selectCountry.xml
@@ -1,26 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="eo">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="eo">
   <info>
     <title xml:id="selectCountry-ti1">Elektu vian Landon / Regionon</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">Se via lando ne estas en la listo, klaku sur la butono <guilabel>Aliaj
-Landoj</guilabel> kaj elektu vian landon / regionon tie.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">Se via lando estas nur en la listo <guilabel>Aliaj Landoj</guilabel>, post
-klaki sur <guibutton>Enorde</guibutton> povas ŝajni ke vi elektis landon de
-la unua listo.  Bv. ignori tion, DrakX daŭrigos kun via reala elekto.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -28,18 +40,19 @@ la unua listo.  Bv. ignori tion, DrakX daŭrigos kun via reala elekto.</para>
       <title xml:id="inputMethod-ti7">Enir-metodo</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
-manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar
+manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
 functions and can be installed if you added HTTP/FTP media before package
 selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via "Configure your Computer" ->
-"System", or by running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/selectInstallClass.xml b/docs/docs/stable/installer/eo/selectInstallClass.xml
index cea426e6..21d8716d 100644
--- a/docs/docs/stable/installer/eo/selectInstallClass.xml
+++ b/docs/docs/stable/installer/eo/selectInstallClass.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- 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="eo" xml:id="selectInstallClass">
+<section version="5.0" xml:lang="eo" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
 
   
 
@@ -14,6 +15,13 @@
   
 
   
+
+  
+
+  
+
+  
+
   
 
   <info>
@@ -23,51 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Instalado/ĝisdatigo</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectInstallClass.png" align="center"
-width="800" format="PNG" depth="600"></imagedata> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Instalado</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Uzu tiun elekton por freŝa instalado de <application>Magejo</application> .</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Ĝisdatigu</para>
-
-      <para>If you have one or more <application>Mageia</application> installations on
-your system, the installer will allow you to upgrade one of them to the
-latest release.</para>
-
-<warning>
-	<para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that had already
-reached its End	Of Life when this one was released, then it is better to do
-a clean install while preserving your <literal>/home</literal> partition.</para>
-</warning>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
+
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>Se iam dum la instalado vi decidas haltigi ĝin, eblas reŝarĝi la komputilon,
-sed bv. pripensi tion dufoje antaŭe.  Post la strukturado de subdisko aŭ
-post la ekinstalo de ĝisdatigo via komputilo ne plu restos egale, reŝarĝi
-ĝin povus igi vian sistemon neuzebla. Se malgraŭ tio vi estas certa pri tio
-ke vi volas reŝarĝi, malfermu teksto-terminalon premante la tri klavojn
-<guibutton>Alt Ctrl F2</guibutton> samtempe.  Post tio, premu <guibutton>Alt
-Ctrl Delete</guibutton> samtempe por reŝarĝi.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
-    <para>Se vi rimarkas ke vi forgesis selekti aldonan lingvon, vi povas reveni el la
-ekrano "Instalado/ĝisdatigo" al la ekrano por lingva elekto per la premo de
-<guilabel>Alt Ctrl Home</guilabel>.  <emphasis>Ne</emphasis> faru tion poste
-en la instalo.</para>
+    <para>If you have discovered that you forgot to select an additional language, you
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
 </section>
diff --git a/docs/docs/stable/installer/eo/selectKeyboard.xml b/docs/docs/stable/installer/eo/selectKeyboard.xml
index 856c287b..5054ffa5 100644
--- a/docs/docs/stable/installer/eo/selectKeyboard.xml
+++ b/docs/docs/stable/installer/eo/selectKeyboard.xml
@@ -10,9 +10,18 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Klavaro</title>
   </info>
 
@@ -20,8 +29,8 @@
 aŭtomate elektos usonan klavaron.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png"
-align="center"></imagedata> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
+</imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
@@ -33,21 +42,22 @@ xlink:href="http://eo.wikipedia.org/wiki/Klavarfasono">eo.wikipedia.org/wiki/Kla
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="selectKeyboard-pa3">Se via klavaro ne estas en la montrita listo klaku sur la butono
-<guibutton>Pli (Plu)</guibutton> por aliri etenditan liston kaj selektu vian
-klavaron tie.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">Post elekti klavaron per la butono <guibutton>Pli (Plu)</guibutton> , vi
-revenos al la unua priklavara ekrano sed povos ŝajni kvazaŭ klavaro de tiu
-ekrano estas elektita. Vi povas sentime ignori tiun anomalion kaj daŭrigi la
-instaladon: Via klavaro estas tiu kiun vi elektis per la etendita listo.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="selectKeyboard-pa4">Se vi elektis klavaron nebazitan sur latinaj literoj, vi vidos aldonan
-ekranon demandantan kiel vi ŝatus ŝanĝi inter latinaj kaj nelatinaj klavaroj</para>
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
+extra dialogue screen asking how you would prefer to switch between the
+Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/eo/selectKeyboardLive.xml b/docs/docs/stable/installer/eo/selectKeyboardLive.xml
index 1b75d8d8..4a2d6516 100644
--- a/docs/docs/stable/installer/eo/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/eo/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Select keyboard</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>You will be required to set the keyboard layout you wish to use in
-Mageia​​. The default one is selected according to your language and
-timezone previously selected.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/eo/selectLanguage.xml b/docs/docs/stable/installer/eo/selectLanguage.xml
index bb581b1f..60e04ee6 100644
--- a/docs/docs/stable/installer/eo/selectLanguage.xml
+++ b/docs/docs/stable/installer/eo/selectLanguage.xml
@@ -1,9 +1,33 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="eo" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
   
+
   
+
   
+
   
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 04 01, using barjac's text -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -12,41 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Bv. elekti la uzotan lingvon</title>
   </info>
-  <para condition="classical">Selektu vian preferatan lingvon unue per la disfaldo de via kontinenta
-listo. <application>Magejo</application> uzos ĉi tiun selekton dum la
-instalado kaj por la instalita sistemo.</para>
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
-  <para condition="classical">Se vi bezonas instali en via sistemo plurajn lingvojn por vi aŭ aliaj
-uzuloj, tiam vi devas utiligi la butonon <guibutton>Multaj lingvoj (Multiple
-languages)</guibutton> por aldoni ilin nun. Estos malfacile aldoni plian
-lingvan eltenon post la instalo.</para>
+
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
+
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
+
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
-  <warning condition="classical">
-    <para>Se vi elektas pli ol unu lingvon, vi devas selekti unu el ili kiel vian
-preferatan lingvon en la komenca lingva ekrano. Ĝi markiĝos ankaŭ en la
-plurlingva ekrano .</para>
-  </warning>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
+
   <itemizedlist>
     <listitem condition="classical">
-      <para>Se via klavara lingvo ne estas la sama kiel via preferata lingvo, tiam estas
-rekomendinde instali la lingvon de via klavaro ankaŭ.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
+
     <listitem>
-      <para>Mageia uses UTF-8 (Unicode) support by default.</para>
-      <para condition="classical">Ĉi tio povas esti malŝaltita en la plurlingva ekrano se vi certas pri tio ke
-ĝi estas neadekvata por via lingvo. Malŝalti unikodon havos konsekvencojn
-sur ĉiuj instalitaj lingvoj.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
+
     <listitem>
-      <para>Vi povas ŝanĝi la lingvon de via sistemo post la instalo per la Kontrolilo
-de Magejo -> Sistemo -> Agordi skrib-sistemojn.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eo/selectMouse.xml b/docs/docs/stable/installer/eo/selectMouse.xml
index 5ae7ff9d..d4ffaa30 100644
--- a/docs/docs/stable/installer/eo/selectMouse.xml
+++ b/docs/docs/stable/installer/eo/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="eo">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Selekti muson</title>
   </info>
@@ -7,26 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-selectMouse.png"
-width="800" depth="600" format="PNG" align="center"
-xml:id="selectMouse-im1"></imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Se vin ne kontentigas la funkciado de via muso, vi povas elekti iun malsaman
 ĉi tie.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Ofte, <guilabel>Universala</guilabel> - <guilabel>Ajna PS/2- kaj
-USB-musoj</guilabel> estas bona elekto.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Selektu <guilabel>Universalan</guilabel> - <guilabel>Trudi evdev</guilabel>
-por konfiguri la butonojn kiuj ne funkcias en muso kun ses aŭ pli butonoj.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/eo/setupBootloader.xml b/docs/docs/stable/installer/eo/setupBootloader.xml
index 8aeb08fd..27ed10eb 100644
--- a/docs/docs/stable/installer/eo/setupBootloader.xml
+++ b/docs/docs/stable/installer/eo/setupBootloader.xml
@@ -1,227 +1,198 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="eo" xml:id="setupBootloader">
+  
+  
+  
+  
   
-
   
-
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Lanĉilaj ĉefaj elektoj</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
-
   <section>
-    <title>Bootloader interface</title>
-
-    <para>By default, Mageia uses exclusively:</para>
-
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-
-    <section>
-      <title>Grub2 on Legacy/MBR and Legacy/GPT systems</title>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-
-      <para>Don't modify the "Boot Device" unless you really know what you are doing.</para>
-    </section>
-
-    <section>
-      <title>Grub2-efi on UEFI systems</title>
-
-      <para>With an UEFI system, the user interface is slightly different as you cannot
-choose between with or without graphical menu</para>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to receive the bootloader
-(Grub2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds grub2-efi. Although it is possible to have
-several ESPs, only one is advised and enough whatever the number of
-operating systems you have.</para>
-
-      <para>Don't modify the "Boot Device" unless you really know what you are doing.</para>
-    </section>
-  </section>
-
-  <section>
-    <title xml:id="setupMageiaBootloader">Uzi la lanĉilon de Magejo</title>
-
-    <para>By default, according to your system, Mageia writes a new:</para>
-
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard
-drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then uncheck the box
-<guilabel>Probe Foreign OS</guilabel></para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
-  </section>
-
-  <section>
-    <title>Uzi ekzistantan lanĉilon</title>
-
-    <para>La ĝusta procezo por aldoni vian Magejan sistemon al ekzistanta lanĉilo
-estas preter la celo de tiu ĉi helpilo, tamen en la plimulto el la kazoj
-estos necese lanĉi lanĉilan instal-programon kiu devus detekti kaj konfiguri
-ĝin aŭtomate.  Vidu la dokumentaron por la konkreta operacia sistemo.</para>
-  </section>
-
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-
-    <para>If you don't want a bootable Mageia, but to chain load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
   </section>
-
   <section>
-    <title>Options</title>
-
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>First page</title>
-
-      <para><itemizedlist>
-          <listitem>
-            <para><guilabel>Delay before booting the default image</guilabel>: This text box
-lets you set a delay in seconds before the default operating system is
-started up.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be asked at the boot
-time to select a booting entry or change settings. The username is "root"
-and the password is the one chosen here after.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Password</guilabel>: This text box is where you actually put the
-password</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Password (again)</guilabel>: Retype the password and Drakx will
-check that it matches with the one set above.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Advanced</guilabel></para>
-
-            <itemizedlist>
-              <listitem>
-                <para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for the power management. It can save energy by
-stopping unused devices, this was the method used before APM. Unchecking it
+      <title>Lanĉilaj ĉefaj elektoj</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable SMP</guilabel>: This option enables / disables symmetric
-multiprocessing for multi core processors.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the
-operating system access to the Advanced Programmable Interrupt
-Controller. APIC devices permit more complex priority models, and Advanced
-IRQ (Interrupt Request)  management.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which
-manages all external interrupts for a specific processor in an SMP system.</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist></para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
-
     <section>
-      <title>Next page</title>
-
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
-
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist>
-              <listitem>
-                <para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-the boot menu will use. If you click the down triangle you will be offered
-other size and colour depth options.</para>
-              </listitem>
-
-              <listitem>
-                <para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para>
-              </listitem>
-            </itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Uzi ekzistantan lanĉilon</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Add or Modify a Boot Menu Entry</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/setupBootloaderAddEntry.xml b/docs/docs/stable/installer/eo/setupBootloaderAddEntry.xml
index 0998a04a..f99a8f79 100644
--- a/docs/docs/stable/installer/eo/setupBootloaderAddEntry.xml
+++ b/docs/docs/stable/installer/eo/setupBootloaderAddEntry.xml
@@ -1,15 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns5="http://www.w3.org/2000/svg" version="5.0" xml:lang="eo" xml:id="setupBootloaderAddEntry">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="setupBootloaderAddEntry">
   
+
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
 
 Lebarhon 2016 12 16 Updated for Mageia 6-->
 <title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
   </info>
-  <para>To do that you need to manually edit /boot/grub2/custom.cfg or use the
-software grub-customizer instead (Available in the Mageia repositories).</para>
+
+  <para>To do this you need to manually edit /boot/grub2/custom.cfg or use the
+software <emphasis role="bold">grub-customizer</emphasis> tool instead
+(available in the Mageia repositories).</para>
+
   <note>
-    <para>For more information, see our wiki: <link
+    <para>For more information, see: <link
 ns2:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
   </note>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/setupSCSI.xml b/docs/docs/stable/installer/eo/setupSCSI.xml
index 51a7f071..7a0b0114 100644
--- a/docs/docs/stable/installer/eo/setupSCSI.xml
+++ b/docs/docs/stable/installer/eo/setupSCSI.xml
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="setupSCSI" version="5.0" xml:lang="eo">
-
+<section version="5.0" xml:lang="eo" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Konfiguri SCSI</title>
   </info>
 
   
+
   
+
   
+
   
-   
+
   
+
   
+
   
+
   
+
   
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- JohnR - edited 2012-03-03 -->
@@ -30,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata revision="1" fileref="dx2-setupSCSI.png"
-width="800" depth="600" format="PNG" align="center"
-xml:id="setupSCSI-im1"></imagedata> </imageobject></mediaobject>
-
-  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX kutime trovas fiksitajn diskojn senprobleme. Ĝi tamen povas ne trovi
-kelkajn malnovajn SCSI-aparatojn kaj do malsukcesi pri la instalado de la
-bezonataj peliloj.</para>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="setupSCSI-pa2">Se tio okazas, vi devos permane diri al Drakx kiun SCSI-aparaton vi havas.</para>
+  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
+SCSI controllers it may be unable to determine the correct drivers to use
+and subsequently fail to recognise the drive.</para>
 
-  <para revision="3" xml:id="setupSCSI-pa3">DrakX devus tiam esti kapabla konfiguri la aparato(j)n ĝuste.</para>
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
 </section>
diff --git a/docs/docs/stable/installer/eo/software.xml b/docs/docs/stable/installer/eo/software.xml
new file mode 100644
index 00000000..94a55258
--- /dev/null
+++ b/docs/docs/stable/installer/eo/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="eo" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eo/soundConfig.xml b/docs/docs/stable/installer/eo/soundConfig.xml
index 9eabb510..e22567ca 100644
--- a/docs/docs/stable/installer/eo/soundConfig.xml
+++ b/docs/docs/stable/installer/eo/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="eo">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Sound Configuration</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if we have a default
-one.</para>
+  
 
-  <para>The default driver should work without problems. However, if after install
-you do encounter problems, then run <command>draksound</command> or start
-this tool via MCC (Mageia Control Center), by choosing the
-<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound
-Configuration</guilabel> at the top right of the screen.</para>
+  
 
-  <para>Then, in the draksound or "Sound Configuration" tool screen, click on
-<guibutton>Advanced</guibutton> and then on
-<guibutton>Troubleshooting</guibutton> to find very useful advice about how
-to solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Progresinta</title>
     </info>
 
-    <para>Clicking <guibutton>Advanced</guibutton> in this screen, during install, is
-useful if there is no default driver and there are several drivers
-available, but you think the installer selected the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on
-<guibutton>Let me pick any driver</guibutton>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eo/takeOverHdConfirm.xml b/docs/docs/stable/installer/eo/takeOverHdConfirm.xml
index f6b70f35..6768f8f4 100644
--- a/docs/docs/stable/installer/eo/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/eo/takeOverHdConfirm.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eo" xml:id="takeOverHdConfirm">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Confirm hard disk to be formatted</title>
   </info>
@@ -7,7 +13,11 @@
   
 
   
+
   
+
+  
+
   
 
   
@@ -19,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition='live'> <imagedata
-fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
-fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <guibutton>Previous</guibutton> if you are not sure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <guibutton>Next</guibutton> if you are sure and want to erase every
-partition, every operating system and all data on that hard disk.</para>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/eo/testing.xml b/docs/docs/stable/installer/eo/testing.xml
index d098402e..d997ec73 100644
--- a/docs/docs/stable/installer/eo/testing.xml
+++ b/docs/docs/stable/installer/eo/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testing Mageia as Live system</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Live mode</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>You get this screen if you selected "Boot Mageia". If not, you get the
-"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Testing hardware</title>
       </info>
 
-      <para>One of the Live mode goals is to test if the hardware is correctly managed
-by Mageia. You can check if all devices have a driver in the Hardware
-section of the Mageia Control Center. You can test the most current devices:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>graphical card: if you see the previous screen, it's already OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webcam:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>printer: configure it and print a test page</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
       </itemizedlist>
 
-      <para>If all is OK for you, you can process to the installation. If not, you can
-leave with the quit button.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>The configuration settings you made here are kept for the installation.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,15 +68,14 @@ leave with the quit button.</para>
         <title xml:id="testing3-ti1">Launch installation</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
-SSD drive, simply click on the icon "Install on Hard Disk". You will get
-this screen, and then the "<link
-linkend="doPartitionDisks">Partitioning</link> step" as for the direct
-installation.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/eo/uninstall-Mageia.xml b/docs/docs/stable/installer/eo/uninstall-Mageia.xml
index 9774c8a0..4c50942b 100644
--- a/docs/docs/stable/installer/eo/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/eo/uninstall-Mageia.xml
@@ -1,38 +1,48 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="eo">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eo" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
   </info>
 
   
 
-  <section>
-    <title xml:id="uninstall-Mageia-ti2">Howto</title>
+  
 
-    <para>If Mageia didn't convince you or you can't install it correctly, in short
-you want get rid of it. That is your right and Mageia also gives you the
+  <para>If Mageia didn't convince you or you can't install it correctly - in short
+you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-    <para>After your data backup, reboot your installation Mageia DVD and select
-Rescue system, then, Restore Windows boot loader. At the next boot, you will
-only have Windows with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-    <para>To recover the space used by Mageia partitions on Windows, click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code> to access to the partition
-management. You will recognize the Mageia partition because they are labeled
-<guilabel>Unknown</guilabel>, and also by their size and place in the
-disk. Right click on each of these partitions and select
-<guibutton>Delete</guibutton>. The space will be freed.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-    <para>If you are using Windows XP, you can create a new partition and format it
-(FAT32 or NTFS). It will get a partition letter.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
-    <para>If you have Vista or 7, you have one more possibility, you can extend the
-existing partition that is at the left of the freed space.  There are other
-partitioning tools that can be used, such as gparted, available for both
-windows and linux. As always, when changing partitions, be very careful, and
-make sure all important things have been backed up.</para>
-  </section>
-</section>
\ No newline at end of file
+  <para>If you have Vista or 7, you have one more possibility, you can extend the
+existing partition that is at the left of the freed space. There are other
+partitioning tools that can be used, such as <emphasis
+role="bold">gparted</emphasis>, available for both Windows and Linux. As
+always, when changing partitions, be very careful to back up anything
+important to you.</para>
+</section>
diff --git a/docs/docs/stable/installer/eo/unused.xml b/docs/docs/stable/installer/eo/unused.xml
index 87dee252..50bd2075 100644
--- a/docs/docs/stable/installer/eo/unused.xml
+++ b/docs/docs/stable/installer/eo/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eo" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="eo">
   <info>
     <title xml:id="unused-ti1">Keep or delete unused material</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para>In this step, the installer looks for unused locales packages and unused
-hardware packages. Then it proposes you to delete them. It is a good idea to
-accept, except if you prepare an installation which has to run on different
-hardware.</para>
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
+
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>The next step is the copying of files on hard disk. This takes some
-minutes. At the end, you get a blank screen for some time, it's normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/es/DrakLive-cover.xml b/docs/docs/stable/installer/es/DrakLive-cover.xml
index fb33bd33..f31c8831 100644
--- a/docs/docs/stable/installer/es/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/es/DrakLive-cover.xml
@@ -1,75 +1,103 @@
-<?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="es" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="es" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Instalación desde un medio LIVE</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Enero de 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Instalación desde un medio LIVE</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Documentación Oficial para Mageia</para>
+      <para role="tagline">Documentación Oficial para Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Los textos y capturas de pantalla de este manual están disponibles bajo la
+
+      <para>Los textos y capturas de pantalla de este manual están disponibles bajo la
 licencia CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-            </para>
-            <para>Éste manual ha sido realizado con la ayuda de <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Éste manual ha sido realizado con la ayuda de <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> desarrollado por <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>
-            </para>
-            <para>Fue escrito por voluntarios en sus ratos libres. Por favor contacte con el
+ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+      <para>Fue escrito por voluntarios en sus ratos libres. Por favor contacte con el
 <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipo de
-Documentación</link> si puede ayudar a mejorar este manual.</para> 
+Documentación</link> si puede ayudar a mejorar este manual.</para>
     </cover>
   </info>
+
   <article>
     <title>Instalación desde un medio LIVE</title>
-       <para><note>
-          <para>Nadie verá las imágenes que puede ver en este manual. Las imágenes que verá
+
+    <para><note>
+        <para>Nadie verá las imágenes que puede ver en este manual. Las imágenes que verá
 dependerán de su hardware y las decisiones que tomó durante la instalación.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/es/DrakLive.xml b/docs/docs/stable/installer/es/DrakLive.xml
index 69485176..d6fcdb88 100644
--- a/docs/docs/stable/installer/es/DrakLive.xml
+++ b/docs/docs/stable/installer/es/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="es" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="es" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Instalación desde un medio LIVE</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Instalación desde un medio LIVE</title>
 
     <cover>
       <para><note>
@@ -16,9 +31,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> desarrollado por <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
 
-      <para>Fue escrito por voluntarios en sus ratos libres. Por favor contacte con el
-<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipo de
-Documentación</link> si puede ayudar a mejorar este 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>
 
@@ -38,7 +53,12 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -48,17 +68,18 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/es/DrakX-cover.xml b/docs/docs/stable/installer/es/DrakX-cover.xml
index d0a559c6..600317de 100644
--- a/docs/docs/stable/installer/es/DrakX-cover.xml
+++ b/docs/docs/stable/installer/es/DrakX-cover.xml
@@ -1,114 +1,153 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="es" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="es" xml:id="Quick-Startup"
+      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>Instalación con DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Febrero 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Febrero 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Documentación Oficial para Mageia</para>
+      <para role="tagline">Documentación Oficial para Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>Los textos y capturas de pantalla de este manual están disponibles bajo la
+
+      <para>Los textos y capturas de pantalla de este manual están disponibles bajo la
 licencia CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-	    </para>
-	    <para>Éste manual ha sido realizado con la ayuda de <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Éste manual ha sido realizado con la ayuda de <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> desarrollado por <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>
-	    </para>
-            <para>Fue escrito por voluntarios en sus ratos libres. Por favor contacte con el
+ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+      <para>Fue escrito por voluntarios en sus ratos libres. Por favor contacte con el
 <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipo de
-Documentación</link> si puede ayudar a mejorar este manual.</para> 
+Documentación</link> si puede ayudar a mejorar este manual.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Instalación con DrakX</title>
-       <para><note>
-          <para>Nadie verá las imágenes que puede ver en este manual. Las imágenes que verá
+
+    <para><note>
+        <para>Nadie verá las imágenes que puede ver en este manual. Las imágenes que verá
 dependerán de su hardware y las decisiones que tomó durante la instalación.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -116,29 +155,32 @@ dependerán de su hardware y las decisiones que tomó durante la instalación.</
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/es/DrakX-inline.xml b/docs/docs/stable/installer/es/DrakX-inline.xml
new file mode 100644
index 00000000..5321c4c9
--- /dev/null
+++ b/docs/docs/stable/installer/es/DrakX-inline.xml
@@ -0,0 +1,137 @@
+<?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="es" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Instalación con DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>Nadie verá las imágenes que puede ver en este manual. Las imágenes que verá
+dependerán de su hardware y las decisiones que tomó durante la instalación.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Los textos y capturas de pantalla de este manual están disponibles bajo la
+licencia CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Éste manual ha sido realizado con la ayuda de <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> desarrollado por <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+      <para>Fue escrito por voluntarios en sus ratos libres. Por favor contacte con el
+<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipo de
+Documentación</link> si puede ayudar a mejorar este manual.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/DrakX.xml b/docs/docs/stable/installer/es/DrakX.xml
index ac0b8ec6..b9b16e69 100644
--- a/docs/docs/stable/installer/es/DrakX.xml
+++ b/docs/docs/stable/installer/es/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="es" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="es" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Instalación con DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Instalación con DrakX</title>
 
     <cover>
       <para><note>
@@ -33,18 +71,6 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -59,23 +85,28 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -85,7 +116,10 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -93,19 +127,25 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -113,11 +153,15 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -136,4 +180,4 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/es/SelectAndUseISOs2.xml b/docs/docs/stable/installer/es/SelectAndUseISOs2.xml
index 11ef4624..25bb06f6 100644
--- a/docs/docs/stable/installer/es/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/es/SelectAndUseISOs2.xml
@@ -1,38 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="es" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Seleccione y use una ISO</title>
   </info>
   <section>
     <title>Introducción</title>
     <para>Mageia se distribuye a través de imágenes ISO. Esta página le ayudará a
 elegir qué imagen se adapta mejor a sus necesidades.</para>
-    <para>Hay dos familias de medios:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Instalador clásico: el arranque con este medio le brinda la máxima
-flexibilidad a la hora de elegir qué instalar y para configurar su
-sistema. En particular, puede elegir qué entorno de escritorio instalar</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>Medios Live: Esta opción le permite probar Mageia sin tener que instalarlo o
-realizar cambios en su equipo. Si se decide por la instalación, el proceso
-es más simple, pero obtiene menos opciones que las ofrecidas por el
-instalador clásico.</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>Estos medios son muy livianos (menos de 100 MB) y son convenientes si el
+ancho de banda es demasiado bajo para descargar un DVD completo, o si tiene
+una PC sin una unidad de DVD o no puede arrancar desde una memoria USB.</para>
       </listitem>
     </itemizedlist>
-    <para>En las siguientes secciones se dan los detalles.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Medio</title>
     <section>
       <title>Definicion</title>
-      <para>Aquí, un medio (plural: media) es un archivo de imagen ISO que le permite
-instalar y / o actualizar Mageia y, por extensión, cualquier soporte físico
-(DVD, dispositivo USB, ...) en el que se copia el archivo ISO.</para>
+      <para>Here, a medium (plural: media) is an ISO image file that allows you to
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>Puede encontrar las ISO de Mageia aquí.</para>
     </section>
     <section>
@@ -41,25 +76,25 @@ instalar y / o actualizar Mageia y, por extensión, cualquier soporte físico
         <title>Caracterśticas comunes.</title>
         <itemizedlist>
           <listitem>
-            <para>Estas ISO usan el instalador clásico llamado drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
-            <para>Se usan para realizar instalaciones limpias o para actualizar una versión
-previamente instalada de Mageia</para>
+            <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Diferentes medios para arquitecturas de 32 y 64 bits.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Algunas herramientas están disponibles en la pantalla de bienvenida: Sistema
-de Rescate, Prueba de Memoria, Herramienta de Detección de Hardware.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Cada DVD contiene todos los entornos de escritorio y lenguajes disponibles.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Se le dará la opción durante la instalación de agregar o no software no
-libre.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -70,22 +105,20 @@ libre.</para>
         <title>Caracterśticas comunes.</title>
         <itemizedlist>
           <listitem>
-            <para>Se puede usar para obtener una vista previa del sistema operativo Mageia sin
-tener que instalarlo. También se puede usar para instalar Mageia si lo
-desea.</para>
+            <para>Can be used to preview the Mageia operating system without having to install
+it</para>
           </listitem>
           <listitem>
-            <para>Cada ISO contiene sólo un entorno de escritorio (Plasma, GNOME o Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Diferentes medios para arquitecturas de 32 y 64 bits.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para>Las ISO Live solo se pueden usar para crear instalaciones limpias, no se
-pueden usar para actualizar versiones de Mageia instaladas previamente.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Ellos contienen software no libre.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -93,13 +126,13 @@ pueden usar para actualizar versiones de Mageia instaladas previamente.</para>
         <title>DVD Live Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Solo entorno de escritorio Plasma</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Todos los idiomas disponibles están presentes.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Arquitectura de 64 bits solamente.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -107,13 +140,13 @@ pueden usar para actualizar versiones de Mageia instaladas previamente.</para>
         <title>Live DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>Sólo entorno de escritorio GNOME.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Todos los idiomas disponibles están presentes.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Arquitectura de 64 bits solamente.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -121,13 +154,13 @@ pueden usar para actualizar versiones de Mageia instaladas previamente.</para>
         <title>DVD Live Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Solo entorno de escritorio Xfce</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Todos los idiomas disponibles están presentes.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Arquitecturas de 32 o 64 bits.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -138,22 +171,10 @@ pueden usar para actualizar versiones de Mageia instaladas previamente.</para>
         <title>Caracterśticas comunes.</title>
         <itemizedlist>
           <listitem>
-            <para>Estas son ISO mínimas que no contienen más que lo que se necesita para
-iniciar el instalador de drakx y encontrar drakx-installer-stage2 y otros
-paquetes que son necesarios para continuar y completar la instalación. Estos
-paquetes pueden estar en el disco duro de la PC, en una unidad local, en una
-red local o en Internet.</para>
-          </listitem>
-          <listitem>
-            <para>Estos medios son muy livianos (menos de 100 MB) y son convenientes si el
-ancho de banda es demasiado bajo para descargar un DVD completo, o si tiene
-una PC sin una unidad de DVD o no puede arrancar desde una memoria USB.</para>
-          </listitem>
-          <listitem>
-            <para>Diferentes medios para arquitecturas de 32 y 64 bits.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Los primeros pasos estan solo en inglés.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -161,8 +182,8 @@ una PC sin una unidad de DVD o no puede arrancar desde una memoria USB.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contiene sólo software gratuito, para aquellas personas que prefieren no
-usar software no libre.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -170,8 +191,7 @@ usar software no libre.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contiene software propietario (mayormente drivers, codecs, etc.) para
-aquellos que lo necesiten.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -181,69 +201,89 @@ aquellos que lo necesiten.</para>
     <title>Descargando y verificando medios.</title>
     <section>
       <title>Descargando</title>
-      <para>Una vez que haya elegido su archivo ISO, puede descargarlo usando http o
-BitTorrent. En ambos casos, se le proporciona cierta información, como el
-espejo en uso y una opción para cambiar si el ancho de banda es demasiado
-bajo. Si se elige http, también verá algo relacionado con las sumas de
-comprobación.</para>
+      <para>Once you have chosen your ISO file, you can download it using either http or
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum y sha1sum son herramientas para verificar la integridad ISO. Elija
-una u otra y copie la suma de comprobación para uso posterior. Entonces
-aparecerá una ventana similar a esta:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Seleccione la opción Guardar archivo, luego, haga clic en Aceptar.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Comprobando la integridad de los medios descargados</title>
-      <para>Las sumas de comprobación mencionadas anteriormente son huellas digitales
-generadas por un algoritmo del archivo que se descargará. Puede comparar la
-suma de comprobación de su ISO descargada con la de la fuente ISO
-original. Si las sumas de comprobación no coinciden, significa que los datos
-reales en las ISO no coinciden, y si es el caso, entonces debe volver a
-intentar la descarga o intentar una reparación utilizando BitTorrent.</para>
+      <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>Para generar la suma de comprobación para su ISO descargada, abra una
 consola, (no necesita ser root), y:</para>
       <itemizedlist>
         <listitem>
-          <para>Usar md5sum, tipo:
-md5sum path/to/the/image/file.iso.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>Para usar sha1sum, escriba:
-sha1sum ruta / a / la / imagen / archivo.iso</para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Ejemplo:</para>
+      <para>Ejemplo:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>y compare el resultado (puede que tenga que esperar un tiempo) con la suma
-de comprobación provista por Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Grabar o volcar el ISO</title>
-    <para>La ISO verificada ahora se puede grabar en un CD / DVD o descargar a un
-dispositivo USB. Esta no es una operación de copia estándar ya que se creará
-un medio de arranque.</para>
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
     <section>
       <title>Grabar el ISO en un CD/DVD</title>
-      <para>Cualquiera sea el software que use, asegúrese de que la opción de grabar una
-imagen es usada, grabar datos o archivos no es correcto. Vea la wiki de
-Mageia para más información.</para>
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
+ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
+wiki</link> for more information.</para>
     </section>
     <section>
       <title>Volvar el ISO en un USB</title>
-      <para>Todas las ISOs de Mageia son híbridas, lo que significa que se pueden volcar
-en un USB y usarlas para arrancar e instalar el sistema.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Volcar" una imagen en un dispositivo flash destruye cualquier sistema de
-archivos anterior en el dispositivo; cualquier información existente se
-perderá y la capacidad de la partición se reducirá al tamaño de la imagen.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>Para recuperar la capacidad original, ha de reparticionar y reformatear el
-dispositivo USB.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Usando una herramienta gráfica dentro de Mageia</title>
         <para>Puede usar una herramienta gráfica como <link
@@ -254,7 +294,8 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <para>Usted puede probar:</para>
         <itemizedlist>
           <listitem>
-            <para>Rufus usando la opción de "imagen ISO";</para>
+            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para>Win32 Disk Imager</para>
@@ -262,7 +303,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         </itemizedlist>
       </section>
       <section>
-        <title>Usando la Línea de comandos dentro de un sistema GNU/Linux</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>Es potencialmente * peligroso * hacerlo a mano. Se corre el riesgo de
 sobreescribir datos existentes potencialmente valiosos si especifica el
@@ -273,28 +314,28 @@ dispositivo de destino equivocado.</para>
             <para>Abrir consola</para>
           </listitem>
           <listitem>
-            <para>Conviértase en usuario root (Administrador) con el comando
-su - (no olvide el final '-')</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Conecte su memoria USB (no montar, no habrá cualquier aplicación o gestor de
-archivos que pueda leerlo).</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Introduzca el comando "fdisk-l".</para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Encuentre el nombre del dispositivo para su dispositivo USB (por su tamaño),
-por ejemplo / dev / sdb en la captura de pantalla anterior, es un
-dispositivo USB de 8GB.</para>
-            <para>Alternativamente, puede encontrar el nombre del dispositivo con el comando
-dmesg: al final de este ejemplo, puede ver el nombre del dispositivo que
-comienza con sd, y en este caso, sdd es el dispositivo real. También puede
-ver que su tamaño es de 2 GB:</para>
+            <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+            <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: Nuevo dispositivo USB de alta velocidad número 27 utilizando xhci_hcd
 [72594.770528] usb 1-1: Nuevo dispositivo USB encontrado, idVendedor=8564, idProducto=1000
 [72594.770533] usb 1-1: Nuevas cadenas de dispositivos USB: Mfr=1, Product=2, SerialNumber=3
@@ -315,18 +356,22 @@ ver que su tamaño es de 2 GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Disco extraíble SCSI adjunto</screen></para>
           </listitem>
           <listitem>
-            <para>Ingrese el comando:
-# dd if=path/to/the/ISO/file of=/dev/sdX bs=1M</para>
-            <para>Donde X = el nombre de su dispositivo, por ejemplo: / dev / sdd</para>
-            <para>Ejemplo:
-# dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>Puede ser útil saber que
-si representa archivo de entrada y de soportes para archivo de salida</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Introduce el comando: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>Este es el final de proceso, ahora puede retirar la USB stick.</para>
@@ -335,4 +380,4 @@ si representa archivo de entrada y de soportes para archivo de salida</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/acceptLicense.xml b/docs/docs/stable/installer/es/acceptLicense.xml
index 556e6988..f65e8bf6 100644
--- a/docs/docs/stable/installer/es/acceptLicense.xml
+++ b/docs/docs/stable/installer/es/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Licencia y Notas de la Versión</title>
   </info>
 
@@ -42,19 +51,26 @@ Noticias localizadas</mediaobject>
       <title xml:id="license-ti1">Acuerdo de licencia</title>
     </info>
 
-    <para>Antes de instalar <application>Mageia</application>, por favor, lea
-cuidadosamente los términos y condiciones de la licencia.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Estos términos y condiciones se aplican a la distribución completa de
-<application>Mageia</application> y tiene que aceptarlos para poder
-continuar.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Para continuar, simplemente seleccione
-Aceptar y luego pulsar en Siguiente.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Si decide no aceptar las condiciones, nosotros le agradecemos que las haya
-leído. Haciendo click en <guibutton>Salir</guibutton> se reiniciará su
-ordenador.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -72,7 +88,7 @@ Release Notes</para>
 
     
 
-    <para>Información importante sobre este lanzamiento de
-Mageia se puede ver haciendo clic en el botón Notas de la versión.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/addUser.xml b/docs/docs/stable/installer/es/addUser.xml
index dcdf30e7..77db10df 100644
--- a/docs/docs/stable/installer/es/addUser.xml
+++ b/docs/docs/stable/installer/es/addUser.xml
@@ -1,34 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="es" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Administración de usuarios y del administrador</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Establezca la Contraseña del Administrador (root)</title>
     </info>
 
-    <para>Es aconsejable en todas las instalaciones de Mageia configurar una
-contraseña de superusuario (administrador), generalmente llamada contraseña
-de root en Linux. A medida que ingresa una contraseña en el cuadro superior,
-un escudo cambiará de rojo a amarillo a verde según la intensidad de la
-contraseña. Un escudo verde muestra que está usando una contraseña
-segura. Debe repetir la misma contraseña en el cuadro que se encuentra
-debajo para verificar que la primera entrada no haya sido mal escrita.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>Todas las contraseñas son sensibles a mayúsculas Lo mejor es usar una
-combinación de letras (mayúsculas y minúsculas), números y otros caracteres
-en una contraseña.</para>
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
 
@@ -37,42 +55,46 @@ en una contraseña.</para>
       <title xml:id="enterUser-ti3">Introduzca un usuario</title>
     </info>
 
-    <para>Agregue un usuario aquí. Un usuario regular tiene menos privilegios que el
-superusuario (root), pero suficiente para usar Internet, aplicaciones de
-oficina o juegos y cualquier otra cosa para la que el usuario promedio pueda
-usar su computadora.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Icono</guibutton>: Si hace click en este botón cambiará el icono
-del usuario.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Nombre y Apellidos</guilabel>: Introduzca el nombre real del
-usuario en este recuadro.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para>Nombre de inicio de sesión: ingrese el nombre de usuario o permita que DrakX
-use una versión del nombre real del usuario. El nombre de usuario es
-sensible a mayúsculas y minúsculas</para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para>Contraseña: escriba la contraseña del usuario. Hay un escudo al final del
-cuadro de texto que indica la fuerza de la contraseña. (Ver también )</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para>Contraseña (nuevamente): Vuelva a escribir la contraseña del usuario. DrakX
-verificará que no ha escrito mal la contraseña.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Cualquier usuario que haya agregado al instalar Mageia tendrá un directorio
-de inicio que esté protegido de lectura y escritura (umask = 0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>Puede agregar cualquier usuario adicional necesario en
 Configuración: Resumen durante la instalación. Elija: Administración de
@@ -82,31 +104,31 @@ usuarios.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Administración Avanzada de Usuarios</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>La opción avanzada le permite editar configuraciones adicionales para el
-usuario que está agregando.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para>Shell: esta lista desplegable le permite cambiar el shell disponible para
-cualquier usuario que haya agregado en la pantalla anterior. Las opciones
-son Bash, Dash y Sh</para>
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para>ID de usuario: aquí puede establecer la ID de usuario para cualquier usuario
-que haya agregado en la pantalla anterior. Si no está seguro de cuál es el
-propósito de esto, déjelo en blanco.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para>ID de grupo: esto le permite configurar la ID del grupo
-De nuevo, si no está seguro, déjelo en blanco.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/es/add_supplemental_media.xml b/docs/docs/stable/installer/es/add_supplemental_media.xml
index 2f8ef9bc..c89486ec 100644
--- a/docs/docs/stable/installer/es/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/es/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="es">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Selección de Medios (Configurar Medios de Instalación Complementarios)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,42 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>Esta pantalla muestra la lista de repositorios ya reconocidos. Puede agregar
-otras fuentes para paquetes, desde un disco óptico o una fuente remota. La
-selección de fuente determina qué paquetes estarán disponibles durante los
-pasos siguientes.</para>
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Para un repositorio por red, hay dos pasos a seguir:</para>
 
   <orderedlist>
     <listitem>
-      <para>Elección y activación de la red, si es que no está activada ya.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
-      <para>Seleccionar un espejo o especificar una URL (primera entrada). Al
-seleccionar un espejo, tiene acceso a la selección de todos los repositorios
-administrados por Mageia, como el
-Nonfree, los repositorios Tainted y las actualizaciones. Con la URL, puede
-designar un repositorio específico o su propia instalación de NFS.</para>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>Si está actualizando una instalación de 64 bits que puede contener algunos
-paquetes de 32 bits, se recomienda utilizar esta pantalla para agregar un
-espejo en línea marcando uno de los protocolos de red aquí. El DVD ISO de 64
-bits solo contiene paquetes de 64 bits y noarch, no podrá actualizar los
-paquetes de 32 bits. Sin embargo, después de agregar un espejo en línea, el
-instalador encontrará allí los paquetes de 32 bits necesarios.</para>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/ask_mntpoint_s.xml b/docs/docs/stable/installer/es/ask_mntpoint_s.xml
index eb82c073..9d8b48e6 100644
--- a/docs/docs/stable/installer/es/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/es/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="es">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Elija los puntos de montaje</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,39 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Aquí puede ver las particiones de Linux que se han encontrado en su
-ordenador. Si no está de acuerdo con la sugerencia de
-<application>DrakX</application>, puede cambiar los puntos de montaje.</para>
-
-  <note>
-    <para>Si cambia algo, asegúrese de que todavía tenga una
-partición de raíz /</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Cada partición se muestra a la izquierda como:
-Dispositivo (capacidad, punto de montaje, tipo).</para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para>Dispositivo, se compone de: disco duro, [nombre del disco duro (letra)],
-número de partición (por ejemplo, sda5).</para>
-    </listitem>
-
-    <listitem>
-      <para>Si tiene varias particiones, puede elegir varios puntos de montaje
-diferentes en el menú desplegable, como /, / home y / var. Incluso puede
-hacer sus propios puntos de montaje, por ejemplo / video para una partición
-donde desea almacenar sus películas, o / Datos (o algún otro nombre) para
-sus datos.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -75,12 +82,17 @@ campo de punto de montaje.</para>
   </itemizedlist>
 
   <warning>
-    <para>Si no está seguro de qué elegir, haga clic en Atrás para volver y luego
-marque Partición de disco personalizada, donde puede hacer clic en una
-partición para ver su tipo y tamaño.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Si está seguro de que los puntos de montaje son correctos, haga click en
-<guibutton>Siguiente</guibutton>, y elija si quiere formatear o bien
-solamentelas particiones que DrakX sugiere o bien alguna más.</para>
-</section>
\ No newline at end of file
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/es/bestTime.xml b/docs/docs/stable/installer/es/bestTime.xml
index 5b145bb9..860e9904 100644
--- a/docs/docs/stable/installer/es/bestTime.xml
+++ b/docs/docs/stable/installer/es/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="es" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="es" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Ajustes del Reloj</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>En este paso, tiene que seleccionar en que hora está establecido su reloj,
-ya sea la hora local o UTC.</para>
-
-  <para>En la ficha Avanzada, encontrara más opciones de configuración del reloj.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/bootLive.xml b/docs/docs/stable/installer/es/bootLive.xml
index 119f51d8..5cc40e13 100644
--- a/docs/docs/stable/installer/es/bootLive.xml
+++ b/docs/docs/stable/installer/es/bootLive.xml
@@ -1,29 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="es"><info><title xml:id="bootLive-ti1">Iniciar Mageia en modo Live</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Arrancando el medio</title></info><section><info><title xml:id="bootLive11-ti1">Desde un disco</title></info><para>Puede arrancar directamente desde el CD o DVD en el que grabó la imagen
-ISO. Normalmente tiene que insertarlo en el lector de CD/DVD para que se
-lance el instalador automáticamente cuando reinicie su ordenador. Si eso no
-ocurre, tendrá que configurar la BIOS o pulsar una tecla durante el
-arranque, y que le ofrecerá un menú arranque donde escoger. </para><para>De acuerdo al hardware que tiene, y cómo está configurado, se obtiene una de
-las dos pantallas siguientes.</para></section><section><info><title xml:id="bootLive12-ti1">Desde un dispositivo USB</title></info><para>Puede arrancar desde el dispositivo USB en el que volcó su imagen ISO. De
-acuerdo a la configuración de su BIOS, quizás la computadora arranque
-directamente en el dispositivo USB que ya está conectado al puerto. Si esto
-no ocurre, puede que tenga que volver a configurar su BIOS o presionar una
-tecla que le de la posibilidad de elegir el periférico desde el cual
-arrancará la computadora.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">En modo BIOS/CSM/Legacy</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Primera pantalla al arrancar en modo BIOS</para></caption></mediaobject><para>En el menú del medio, tiene que elegir entre tres acciones:</para><itemizedlist><listitem><para>Arrancar Mageia: Esto significa que Mageia 5 arrancará desde el medio
-conectado (CD/DVD o memoria USB) sin escribir nada en el disco, por lo que
-se espera que el sistema sea muy lento. Una vez realizado el arranque, puede
-seguir con la instalación en el disco rígido.</para></listitem><listitem><para>Instalar Mageia: Esta opción instalará Mageia directamente en un disco
-rígido.</para></listitem><listitem><para>Arrancar desde el disco rígido: Esta opción permite arrancar desde el disco
-rígido, como de costumbre, cuando ningún medio (CD/DVD o memoria USB) está
-conectado (no funciona con Mageia 5).</para></listitem></itemizedlist><para>En el menú inferior, las Opciones de Inicio son:</para><itemizedlist><listitem><para>F1 - Ayuda. Explicar las opciones "splash", "apm", "acpi" e "Ide"</para></listitem><listitem><para>F2 - Idioma. Elegir el idioma de visualización de las pantallas.</para></listitem><listitem><para>F3 - Resolución de pantalla. Elegir entre texto, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom u otro. Normalmente, la instalación se realiza desde el
-medio de instalación insertado. Aquí seleccionar otras fuentes, como
-servidores de FTP o NFS. Si la instalación se lleva a cabo en una red con un
-servidor SLP, seleccione con esta opción una de las fuentes de instalación
-disponibles en el servidor.</para></listitem><listitem><para>F5 - Controlador. Si o No. El sistema sabe de la presencia de un disco
-opcional con una actualización del controlador y requerirá su inserción
-durante el proceso de instalación.</para></listitem><listitem><para>F6 - Opciones del Kernel. Esta es la manera de especificar las opciones de
-acuerdo a su hardware y los controladores a usar.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">En modo UEFI</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Primera pantalla durante el arranque del sistema UEFI desde el disco</para></caption></mediaobject><para>Ud solamente tiene la opción de ejecutar Mageia en modo Live (primera
-opción) o procesar la instalación (segunda opción).</para><para>Si arrancó desde un pen-drive USB, obtendrá dos líneas suplementarias que
-son duplicados de líneas previas con un sufijo "USB". Ha de elegirlas.</para><para>En cada caso, los primeros pasos serán elegir idioma, zona horaria y
-teclado. Después, los procesos serán diferentes, con <link
-linked="testing">pasos adicionales en modo Live</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Iniciar Mageia en modo Live</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Arrancando el medio</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">En modo BIOS/CSM/Legacy</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Primera pantalla al arrancar en modo BIOS</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">En modo UEFI</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/es/chooseDesktop.xml b/docs/docs/stable/installer/es/chooseDesktop.xml
index 10176b8b..33142d12 100644
--- a/docs/docs/stable/installer/es/chooseDesktop.xml
+++ b/docs/docs/stable/installer/es/chooseDesktop.xml
@@ -1,27 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="es" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Selección de escritorio</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Selección de escritorio</title>
   </info>
 
   
 
-  <para>Dependiendo de su selección aquí, aparecerán más pantallas para ajustar su
-elección.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>Después del (los) pasos de selección, verá una presentación de diapositivas
-durante la instalación del paquete. La presentación de diapositivas se puede
-desactivar presionando el botón Detalles</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Elija si prefiere usar el entorno de escritorio de KDE Plasma o GNOME. Ambos
-vienen con un conjunto completo de aplicaciones y herramientas
-útiles. Marque Personalizar si no desea utilizar ninguno (o incluso usar
-ambos) o si desea modificar las opciones de software predeterminadas para
-estos entornos de escritorio. El escritorio LXDE, por ejemplo, es más
-liviano que los dos anteriores, luciendo menos atractivo y con menos
-paquetes instalados por defecto.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/es/choosePackageGroups.xml b/docs/docs/stable/installer/es/choosePackageGroups.xml
index ad8c1967..1bc7c137 100644
--- a/docs/docs/stable/installer/es/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/es/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="es" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="es" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Selección de Grupo de Paquetes</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/es/choosePackagesTree.xml b/docs/docs/stable/installer/es/choosePackagesTree.xml
index 066ed9c8..0b58fde8 100644
--- a/docs/docs/stable/installer/es/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/es/choosePackagesTree.xml
@@ -1,21 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="es">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="es">
   <info>
     <title xml:id="choosePackagesTree-ti1">Elegir paquetes detalladamente</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Aquí puede agregar o eliminar cualquier paquete adicional para personalizar
 su instalación.</para>
 
-  <para>Después de elegir, puede hacer click en el <guibutton>icono del
-disquete</guibutton> al final de la página para guardar su elección de
-paquetes (también puede guardarlas en una unidad USB). Puede usar este
-archivo para instalar los mismos paquetes en otro sistema, pulsando el mismo
-botón durante la instalación para cargarlo.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/configureServices.xml b/docs/docs/stable/installer/es/configureServices.xml
index dcdc5a31..3ca8814b 100644
--- a/docs/docs/stable/installer/es/configureServices.xml
+++ b/docs/docs/stable/installer/es/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="es" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="es" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Configure sus Servicios</title>
   </info>
@@ -7,22 +7,32 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Aquí puede elegir qué servicios deberían comenzar cuando reinicie su
 sistema.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Haga clic en un triángulo para expandir un grupo de todos los servicios
-relevantes.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">La configuración que DrakX eligió suele ser buena.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">Si selecciona un servicio, se mostrara información de este en el recuadro de
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Si selecciona un servicio, se mostrara información de este en el recuadro de
 abajo.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Sólo cambie servicios cuando sepa bien lo que está haciendo.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/configureTimezoneUTC.xml b/docs/docs/stable/installer/es/configureTimezoneUTC.xml
index 420eed97..c3f8ffc5 100644
--- a/docs/docs/stable/installer/es/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/es/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="es">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="es">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Configure su huso horario</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Elija su zona horaria eligiendo su país o una ciudad cercana a usted en la
-misma zona horaria.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">En la pantalla siguiente puede elegir configurar el reloj del hardware a la
 hora local o a GMT, también conocido como UTC.</para>
diff --git a/docs/docs/stable/installer/es/configureX_card_list.xml b/docs/docs/stable/installer/es/configureX_card_list.xml
index 75cd9cec..ddf17ece 100644
--- a/docs/docs/stable/installer/es/configureX_card_list.xml
+++ b/docs/docs/stable/installer/es/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="es">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Escoja un servidor X (Configurando su tarjeta gráfica)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX tiene una base de datos de tarjetas gráficas bastante amplia y
 usualmente puede identificar su tarjeta correctamente.</para>
@@ -29,36 +42,34 @@ usualmente puede identificar su tarjeta correctamente.</para>
   <para>Si el instalador no ha dectectado su tarjeta grafica correctamente y usted
 sabe cuál es, puede escogerla del árbol: <itemizedlist>
       <listitem>
-        <para>fabricante</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>el nombre de su tarjeta</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>y el tipo de tarjeta</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
-  <para>Si no puede encontrar su tarjeta en la lista de proveedores (porque todavía
-no está en la base de datos o es una tarjeta más vieja), puede encontrar un
-controlador adecuado en
-La categoría Xorg, que proporciona más de 40 controladores de tarjetas de
-video genéricos y de código abierto. Si aún no puede encontrar un
-controlador específico para su tarjeta, existe la opción de usar el
-controlador vesa que brinda capacidades básicas.</para>
-
-  <para>Tenga en cuenta que si selecciona un controlador incompatible, es posible
-que solo tenga acceso a la
-Interfaz de línea de comandos.</para>
+  <para>If you cannot find your card in the vendor lists (because it's not yet in
+the database or it's an older card) you may find a suitable driver in the
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Algunos fabricantes de tarjetas de video proporcionan controladores
-propietarios para Linux que solo pueden estar disponibles en el
-repositorio no libre y, en algunos casos, solo desde los sitios web de los
-fabricantes de tarjetas.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
-  <para>Los repositorios Nonfree deben estar explícitamente habilitados para acceder
-a ellos. Si no los habilitó previamente, debe hacerlo después de reiniciar
-su sistema por primera vez.</para>
-</section>
\ No newline at end of file
+  <para>Some video card manufacturers provide proprietary drivers for Linux which
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/es/configureX_chooser.xml b/docs/docs/stable/installer/es/configureX_chooser.xml
index 7fdd8c46..d627f5a0 100644
--- a/docs/docs/stable/installer/es/configureX_chooser.xml
+++ b/docs/docs/stable/installer/es/configureX_chooser.xml
@@ -1,59 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="es">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Configuración de la tarjeta gráfica y del monitor</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
-
-  <para revision="1" xml:id="configureX_chooser-pa1">No importa qué entorno gráfico (también conocido como entorno de escritorio)
-elija para esta instalación de Mageia, todos están basados en un sistema
-gráfico de interfaz de usuario llamado X Window System, o simplemente X. Por
-lo tanto, para que KDE Plasma, GNOME, LXDE o cualquier otro entorno gráfico
-funcione bien, las siguientes configuraciones X deben ser correctas. Elija
-la configuración correcta si no se muestra ninguna, o si cree que los
-detalles son incorrectos.</para>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
+
+  <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Tarjeta gráfica</guibutton></emphasis>: Elija su
-tarjeta de la lista si es necesario.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1">Monitor: puede elegir Plug'n Play, si corresponde, o elegir su monitor de la
-lista de proveedores o genéricos. Elija Personalizado si prefiere configurar
-manualmente las frecuencias de actualización horizontal y vertical de su
-monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Tasas de refresco incorrectas pueden dañar su monitor</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1">Resolución: la resolución y la profundidad de color de su monitor se pueden
-configurar aquí.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1">Prueba: el botón de prueba no siempre aparece durante la instalación. Si la
-opción está ahí, y prueba su configuración, se le preguntará si su
-configuración es correcta. Si responde que sí, la configuración se
-mantendrá. Si no ve nada, volverá a la pantalla de configuración y podrá
-volver a configurar todo hasta que el resultado de la prueba sea
-satisfactorio. Si la opción de prueba no está disponible, asegúrese de que
-su configuración esté puesta correctamente.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Opciones</guibutton></emphasis>: Aquí puede escoger el
-activar o desactivar varias opciones.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/es/configureX_monitor.xml b/docs/docs/stable/installer/es/configureX_monitor.xml
index d0609d19..c94d5e8a 100644
--- a/docs/docs/stable/installer/es/configureX_monitor.xml
+++ b/docs/docs/stable/installer/es/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="es">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,64 +23,82 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Escogiendo su monitor</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX tiene un base de datos de monitores bastante amplia y usualmente puede
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX tiene un base de datos de monitores bastante amplia y usualmente puede
 identificar su monitor correctamente.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1">Seleccionar un monitor con diferentes características podría dañar su
+    <para revision="1" xml:id="configureX_monitor-pa1w">Seleccionar un monitor con diferentes características podría dañar su
 monitor o hardware de video. Por favor, no intente algo sin saber lo que
 está haciendo. En caso de duda, debe consultar la documentación de su
 monitor.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Personalizado</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Esta opción deja cambiar dos parámetros críticos, la tasa de refresco
-vertical y la sincronizacion horizontal. La tasa de refresco vertical
-determina cada cuánto se actualiza la pantalla y la sincronizacion
-horizontal es la tasa por lo cual las lineas de escaneo se pueden ver.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">Es <emphasis>MUY IMPORTANTE</emphasis> que no escoja un tipo de monitor con
+        <para revision="1" xml:id="configureX_monitor-pa4">Es <emphasis>MUY IMPORTANTE</emphasis> que no escoja un tipo de monitor con
 un tasa de refresco superior a la capacidad de su monitor real, puesto que
 puede dañarlo. Si tiene duda, escoja un configuración conservadora y
 consulte la documentacion de su monitor.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">Esta es la opción predeterminada y trata de identificar el tipo de monitor
-que tiene usando la base de datos de monitores.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Vendedor</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">Si el instalador no pudo identificar su monitor correctamente y usted sabe
-cuál es, lo puede escoger del árbol: <itemizedlist>
       <listitem>
-        <para>fabricante</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>el nombre del fabricante del monitor</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>la descripción del monitor</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Si el instalador no pudo identificar su monitor correctamente y usted sabe
+cuál es, lo puede escoger del árbol:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Genérico</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">Al seleccionar este grupo, se mostrarán casi 30 configuraciones de pantalla,
-como 1024x768 @ 60Hz, e incluye pantallas planas como las que se usan en las
-computadoras portátiles. Este es a menudo un buen grupo de selección de
-monitores si necesita usar el
-Controlador de tarjeta Vesa cuando su hardware de video no puede
-determinarse automáticamente. Una vez más, tenga cuidado en su selección.</para>
-</section>
\ No newline at end of file
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/es/diskPartitioning.xml b/docs/docs/stable/installer/es/diskPartitioning.xml
new file mode 100644
index 00000000..2752e3d0
--- /dev/null
+++ b/docs/docs/stable/installer/es/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="es" version="5.0" xml:lang="es">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/diskdrake.xml b/docs/docs/stable/installer/es/diskdrake.xml
index 33d567a7..4f5f7298 100644
--- a/docs/docs/stable/installer/es/diskdrake.xml
+++ b/docs/docs/stable/installer/es/diskdrake.xml
@@ -1,63 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="es" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Particionado de disco personalizado con DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">Si desea usar el cifrado en su partición /, debe asegurarse de tener una
-partición / boot separada. La opción de encriptación para la partición /
-boot NO se debe establecer; de lo contrario, su sistema no podrá arrancar.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modifique el diseño de su (s) disco (s) aquí. Puede eliminar o crear
-particiones, cambiar el sistema de archivos de una partición o cambiar su
-tamaño e incluso ver sus detalles antes de comenzar.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">Hay una pestaña en la parte superior para cada disco duro detectado (u otro
-dispositivo de almacenamiento como un USB). En la captura de pantalla de
-arriba hay dos dispositivos disponibles: sda y sdb.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa5" revision="1">Cuidado con la opción "Borrar todo", úsela solo si está seguro de que desea
-borrar todas las particiones del dispositivo de almacenamiento seleccionado.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6" revision="1">Para el resto de acciones: pulse primero en la partición deseada. Luego,
-visualícelo o elija un sistema de archivos y un punto de montaje, cambie su
-tamaño o límpielo. El modo experto proporciona más opciones, como una
-etiqueta (dar un nombre a) una partición, o elegir un tipo de partición.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continúe hasta que haya ajustado todo a su gusto.</para>
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Haga click en <guibutton>Hecho</guibutton> cuando esté listo.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>Si está instalando Mageia en un sistema UEFI, verifique que esté presente
-una ESP (Partición del sistema EFI) y que esté correctamente montada en /
-boot / EFI (consulte a continuación).</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>Si está instalando Mageia en un sistema Legacy / GPT, compruebe que hay una
-partición de arranque del BIOS y del tipo correcto.</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/es/doPartitionDisks.xml b/docs/docs/stable/installer/es/doPartitionDisks.xml
index 16ab0624..72c80a24 100644
--- a/docs/docs/stable/installer/es/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/es/doPartitionDisks.xml
@@ -1,53 +1,95 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="es" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
+
+  
 
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Particionando</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">En esta pantalla puede ver el contenido de sus discos duros junto con las
-propuestas de particiones de DrakX para saber dónde instalar Mageia.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">Las opciones disponibles de las que se muestran a continuación variarán de
-acuerdo con el diseño y el contenido de su (s) disco (s) particular (es).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Usar la partición existente</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">Si esta opción está disponible significa que se han encontrado particiones
+      <para revision="1" xml:id="doPartitionDisks-pa5">Si esta opción está disponible significa que se han encontrado particiones
 compatibles con Linux que pueden ser usadas para la instalación.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Usar el espacio libre</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">Si tiene espacio sin usar en su disco duro, esta opción lo usará para su
+      <para revision="1" xml:id="doPartitionDisks-pa7">Si tiene espacio sin usar en su disco duro, esta opción lo usará para su
 nueva instalación de Mageia.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Usar espacio libre en una partición de Windows</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
+
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
+
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">Si tiene espacio libre en una partición existente de Windows, el instalador
-puede ofrecer usarlo.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">¡Esta puede ser una manera útil de hacer espacio para su nueva instalación
-de Mageia, pero es una operación peligrosa, así que debería hacer una copia
-de seguridad de todos sus archivos importantes!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Sea consciente de que esta operación implica una reducción del tamaño de la
 partición de Windows. Esta partición debe de estar "limpia", es decir,
 Windows debe de haberse cerrado correctamente la última vez que fue
@@ -55,117 +97,120 @@ usado. También debe de haber sido desfragmentada, aunque esto no garantiza
 que todos los archivos de la partición hayan sido movidos fuera del área que
 se va a usar. Por ello, es altamente recomendable hacer una copia de
 seguridad de sus archivos personales.</para>
+      </important>
+    </listitem>
 
-        <para>Con esta opción, el instalador muestra la partición de Windows restante en
-azul claro y la partición propuesta de Mageia en azul oscuro con los tamaños
-previstos justo debajo. Tiene la opción de modificar estos tamaños haciendo
-clic y arrastrando el espacio entre ambas particiones. Vea la siguiente
-captura de pantalla.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Borrar y usar el disco entero</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">Esta opción asignará todo el disco para Mageia.</para>
-
-        <para xml:id="doPartitionDisks-pa14" revision="1">¡Aviso! Esto borrara TODA la información en el disco duro
-seleccionado. ¡Tenga cuidado!</para>
-
-        <para xml:id="doPartitionDisks-pa15" revision="1">Si pretende usar una parte del disco para otra cosa o ya tiene información
-en la unidad que no quiere perder, no use esta opción.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Particionamiento de disco personalizado</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">Esta opción le ofrece el control completo sobre donde colocar su instalación
+      <para revision="1" xml:id="doPartitionDisks-pa17">Esta opción le ofrece el control completo sobre donde colocar su instalación
 en su(s)  disco(s) duro(s).</para>
-      </listitem>
-    </itemizedlist></para>
+    </listitem>
+  </itemizedlist>
 
-  <para><emphasis role="bold">Tamaño de partición:</emphasis></para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>Si el espacio total disponible es superior a 50 GB, se crean tres
+particiones</para>
 
-  <para>Si no estás usando la opción de particionado de disco personalizado, el
-instalador asignará el espacio disponible de acuerdo con las siguientes
-reglas:</para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>Si el espacio total disponible es inferior a 50 GB, solo se creará una
-partición. Esta será la
-partición (raíz) /.</para>
-      </listitem>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-      <listitem>
-        <para>Si el espacio total disponible es superior a 50 GB, se crean tres
-particiones</para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 del total del espacio disponible se asigna a / con un máximo de 50 GB</para>
-          </listitem>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-          <listitem>
-            <para>1/19 se asigna a swap con un máximo de 4 GB</para>
-          </listitem>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-          <listitem>
-            <para>el resto (al menos 12/19) se asigna a /home.</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-  <para>Eso significa que desde 160 GB o más de espacio disponible, el instalador
-creará tres particiones: 50 GB para /, 4 GB para intercambio y el resto para
-/home.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para>Si está utilizando un sistema UEFI, la ESP (Partición del sistema EFI) se
-detectará automáticamente o se creará si aún no existe y se montará en /
-boot / EFI. La opción de partición de disco personalizado es la única que
-permite comprobar que se ha realizado correctamente</para>
+    <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>Si está utilizando un sistema heredado (CSM o BIOS) con un disco GPT, debe
-crear una partición de arranque del BIOS si aún no existe. Es una partición
-de aproximadamente 1 MiB sin punto de montaje. Escoger 1 para poder crearlo
-con el Instalador como cualquier otra partición, solo seleccione la
-partición de arranque del BIOS como el tipo de sistema de archivos.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+
+  <important>
+    <para>Some newer drives are now using 4096 byte logical sectors, instead of the
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
 
-  <warning>
-    <para>Algunas unidades más nuevas, ahora usan sectores lógicos de 4096 bytes, en
-lugar del estándar anterior de 512. Debido a la falta de hardware
-disponible, la herramienta de creación de particiones utilizada en el
-instalador no se ha probado con dicha unidad. También algunos dispositivos
-SSD ahora usan un tamaño de bloque de borrado de más de 1 MB. Si tiene un
-dispositivo de este tipo, le sugerimos que particione el disco con
-anticipación, utilizando una herramienta alternativa de particionado como
-gparted, y para utilizar la siguiente configuración:</para>
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para>Alinear a = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para>Espacio libre precedente (MiB) = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>También asegúrese de que todas las particiones se creen utilizando una
 cantidad par de megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/es/exitInstall.xml b/docs/docs/stable/installer/es/exitInstall.xml
index b97d0fff..7066fd35 100644
--- a/docs/docs/stable/installer/es/exitInstall.xml
+++ b/docs/docs/stable/installer/es/exitInstall.xml
@@ -5,21 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">Ha terminado de instalar y configurar <application>Mageia</application> y
-ahora es seguro retirar el medio de instalación y reiniciar su ordenador.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">Después del reinicio, en la pantalla del gestor de arranque, puede elegir
-entre los sistemas operativos (si hay más de uno) en su equipo.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">Si no ajustó la configuracion del cargador de arranque, su instalación de
 Mageia será automáticamente seleccionada e iniciada.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">¡Que lo disfrute!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Visite www.mageia.org si tiene alguna duda o quiere contribuir con Mageia.</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/firewall.xml b/docs/docs/stable/installer/es/firewall.xml
index 1ffc497f..b827bec1 100644
--- a/docs/docs/stable/installer/es/firewall.xml
+++ b/docs/docs/stable/installer/es/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="es">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="es" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Cortafuegos</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Cortafuegos</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">Esta sección le permite configurar algunas reglas simples de cortafuegos:
@@ -8,23 +14,24 @@ determinan qué tipo de mensaje de Internet será aceptado por el sistema de
 destino. Esto, a su vez, permite que los servicios correspondientes en el
 sistema sean accesibles desde Internet.</para>
 
-  <para>En la configuración predeterminada (no se marca ningún botón), no se puede
-acceder a ningún servicio del sistema desde la red. La opción "Todo (sin
-cortafuegos)" permite el acceso a todos los servicios de la máquina, una
-opción que no tiene mucho sentido en el contexto del instalador, ya que
-crearía un sistema totalmente desprotegido. Su verdadero uso se encuentra en
-el contexto del Mageia Control Center (que utiliza el mismo diseño de GUI)
-para deshabilitar temporalmente todo el conjunto de reglas de cortafuegos
-para fines de prueba y depuración.</para>
+  <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
 
-  <para>Las demás opciones son más o menos autoexplicativas. Como ejemplo,
-habilitará el Servidor CUPS si desea que las impresoras de su máquina sean
-accesibles desde la red.</para>
+  <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Avanzado</emphasis></para>
 
-  <para>La opción avanzada abre una ventana donde puede habilitar una serie de
-servicios escribiendo una lista de pares (separados por espacios en blanco)</para>
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocolo></emphasis></para>
 
diff --git a/docs/docs/stable/installer/es/formatPartitions.xml b/docs/docs/stable/installer/es/formatPartitions.xml
index 0cc1ce65..19b3a66d 100644
--- a/docs/docs/stable/installer/es/formatPartitions.xml
+++ b/docs/docs/stable/installer/es/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="es">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formateo</title>
   </info>
@@ -11,32 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Aquí puede elegir qué partición (es) desea (n) formatear. Cualquier dato en
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Aquí puede elegir qué partición (es) desea (n) formatear. Cualquier dato en
 particiones no marcado para formatear será preservado.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Normalmente, por lo menos las particiones seleccionadas por DrakX, necesitan
-formatearse.</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Haga click en <guibutton>Avanzado</guibutton> para elegir particiones que
-quiera comprobar los <emphasis>bloques defectuosos</emphasis>.</para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">Si no está seguro de haber tomado la decisión correcta, puede hacer clic en
-Anterior, nuevamente en Anterior y luego en Personalizar para regresar a la
-pantalla principal, donde puede elegir ver los detalles de sus particiones.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">Cuando esté seguro de su elección, haga click en
-<guibutton>Siguiente</guibutton> para continuar.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/es/graphicalConfiguration.xml b/docs/docs/stable/installer/es/graphicalConfiguration.xml
new file mode 100644
index 00000000..e71b8a3e
--- /dev/null
+++ b/docs/docs/stable/installer/es/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/es/installUpdates.xml b/docs/docs/stable/installer/es/installUpdates.xml
index bab97104..74ab1d00 100644
--- a/docs/docs/stable/installer/es/installUpdates.xml
+++ b/docs/docs/stable/installer/es/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="es">
-  <info>
-    <title xml:id="installUpdates-ti1">Actualizaciones</title>
-  </info>
+  
 
   
 
@@ -11,19 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Actualizaciones</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Desde que se lanzara esta versión de <application>Mageia</application>, se
-han actualizado o mejorado algunos paquetes.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Escoja Sí, si desea descargarlos e instalarlos, seleccione No si no desea
-hacer esto ahora o si no está conectado a Internet.</para>
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Presione Next para continuar</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/installer.xml b/docs/docs/stable/installer/es/installer.xml
index badb2a84..5e3fcbb9 100644
--- a/docs/docs/stable/installer/es/installer.xml
+++ b/docs/docs/stable/installer/es/installer.xml
@@ -6,157 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, el instalador de Mageia</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, el instalador de Mageia</title>
   </info>
 
   <para>Seas nuevo en GNU-Linux o un usuario avanzado, el instalador de Mageia está
 diseñado para ayudarle a hacer su instalación o actualización lo más fácil
 posible.</para>
 
-  <para>El menú inicial tiene varias opciones, aunque la elegida por defecto
-iniciará el instalador, que normalmente será todo lo que necesite.</para>
+  <section>
+    <title>Los pasos de la instalación</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Pantalla de bienvenida del Instalador</title>
 
-    <section>
-      <title>Usando un DVD Mageia</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
+
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
 
-      <para>Estas son las pantallas de bienvenida predeterminadas cuando se usa un DVD
-de Mageia. La primera es la que verá si tiene un sistema UEFI, la segunda es
-para un sistema Legacy:</para>
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>Desde esta pantalla, tiene acceso a las opciones presionando "e" para
-ingresar al modo de edición. Para volver a esta pantalla, presione la tecla
-Esc para salir sin guardar o presione la tecla Ctrl o F10 para salir con el
-guardado.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>Desde esta pantalla, es posible establecer algunas preferencias (tenga en
-cuenta que las opciones F1 a F6 están disponibles solo en sistemas Legacy):<itemizedlist>
-          <listitem>
-            <para>En cualquiera de las opciones F2 a F6, puede ver ayuda relevante al
-presionar F1</para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Presione F2 para que el instalador use un lenguaje específico para la
-instalación.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use las teclas de flecha para seleccionar el idioma y luego presione Enter.</para>
-          </listitem>
-
-          <listitem>
-            <para>Si es necesario, cambie la resolución de la pantalla presionando F3 (solo
-modo Legacy).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Si tiene problemas con la instalación, puede intentar modificar la
-configuración predeterminada utilizando las Opciones de Kernel F6 (para
-sistemas UEFI presione "e" en su lugar).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Predeterminado: no altera nada en las opciones predeterminadas.</para>
-              </listitem>
-
-              <listitem>
-                <para>Configuración segura: se da prioridad a las opciones más seguras en
-detrimento del rendimiento.</para>
-              </listitem>
-
-              <listitem>
-                <para>Sin ACPI: (Configuración avanzada e interfaz de alimentación): las funciones
-de administración de energía no se utilizan.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Controlador de interrupción programable avanzado local):
-Interrupción de la CPU. Seleccione esta opción si experimenta mal
-comportamiento del sistema como un kernel panic en relación con APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>Cuando seleccione una de estas entradas, se modifica las opciones por
-defecto mostradas en la línea <guilabel>Opciones de Arranque</guilabel>.</para>
-
-            <note>
-              <para>En algunas versiones de Mageia, puede suceder que las entradas seleccionadas
-con F6 no aparezcan en la línea de Opciones de arranque, a pesar de esto,
-serán aplicadas.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Presionando F1 abrirá una ventana de ayuda para varias opciones de
-arranque. Seleccione una de ellas con las teclas de flecha y presione Enter
-para obtener más detalles o presione Esc para regresar a la pantalla de
-bienvenida.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>La vista detallada sobre la opción splash. Presione Esc o seleccione Volver
-a las opciones de inicio para volver a la lista de opciones. Estas opciones
-se pueden agregar a mano en la línea Opciones de inicio.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>La ayuda se traduce en el idioma elegido con F2.</para>
-            </note>
-
-            <para>Para más información acerca de las opciones del kernel en sistemas antiguos
-y UEFI, ver <link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>Los pasos de la instalación</title>
+    <section>
+      <title>UEFI Systems</title>
+
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
+
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>El proceso de instalación se divide en una serie de pasos, cuyo estado se
-indica en un panel a la izquierda de la pantalla.</para>
-
-    <para>Cada paso tiene una o más pantallas que también pueden tener secciones
-avanzadas con opciones adicionales, menos requeridas.</para>
-
-    <para>La mayoría de las pantallas tienen botones de ayuda para obtener más
-detalles sobre el paso en particular.</para>
-
-    <note>
-      <para>Si en algunos momentos durante la instalación decide detenerla, es posible
-reiniciar, pero por favor piense dos veces antes de hacer esto. Una vez que
-una partición ha sido formateada o las actualizaciones han comenzado a
-instalarse, su equipo ya no está en el mismo estado y reiniciarlo podría
-dejarlo con un sistema inutilizable. Si a pesar de esto está seguro de que
-reiniciar es lo que desea, vaya a un terminal de texto presionando las tres
-teclas Alt+Ctrl+F2 al mismo tiempo. Después de eso, presione
-Alt+Ctrl+Eliminar simultáneamente para reiniciar.</para>
-    </note>
+      <itemizedlist>
+        <title>Menu</title>
+
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -167,19 +174,20 @@ Alt+Ctrl+Eliminar simultáneamente para reiniciar.</para>
 
       <itemizedlist>
         <listitem>
-          <para>Después de la pantalla inicial, no carga la pantalla de selección del
-idioma. Esto puede ocurrir con algunas tarjetas gráficas y sistemas
-antiguos. Intente usando una resolución más baja, escribiendo
-<code>vgalo</code> en la terminal.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
-          <para>Si el hardware es muy viejo, una instalación gráfica puede no ser
-posible. En este caso, vale la pena intentar una instalación en modo
-texto. Para ello presione Esc en la primera pantalla de bienvenida y
-confirme con ENTER. Aparecerá una pantalla en negro con la palabra
-"boot:". Escriba "text" y presione ENTER para continuar con la instalación
-en modo de texto.</para>
+          <para>If the hardware is very old, a graphical installation may not be
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -187,29 +195,31 @@ en modo de texto.</para>
     <section>
       <title>La Instalación se congela</title>
 
-      <para>Si el sistema parece congelarse durante la instalación, puede ser un
-problema con la detección de hardware. En este caso, la detección automática
-de hardware se puede desactivar y configurarse después. Para probar esto,
-escriba <code>noauto</code> en la terminal.  Esta opción puede ser combinada
-con otras si es necesario.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
       <title>Problema de RAM</title>
 
-      <para>Esto rara vez será necesario, pero en algunos casos el hardware puede
-informar la RAM disponible incorrectamente. Para especificar esto
-manualmente, puede usar el parámetro mem = xxxM , donde xxx es la cantidad
-correcta de RAM. p.ej. mem = 256M especificaría 256MB de RAM.</para>
+      <para>This will rarely be needed, but in some cases the hardware may report the
+available RAM incorrectly. To specify this manually, you can use the
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Particiones dinámicas</title>
 
-      <para>Si convirtió su disco duro de formato básico a formato dinámico en Microsoft
-Windows, entonces no es posible instalar Mageia en este disco. Para volver a
-un disco básico, consulte la documentación de Microsoft:
-http://msdn.microsoft.com/en-us/library/cc776315.aspx.</para>
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
+ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/es/locale.xml b/docs/docs/stable/installer/es/locale.xml
new file mode 100644
index 00000000..e776b293
--- /dev/null
+++ b/docs/docs/stable/installer/es/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/es/login.xml b/docs/docs/stable/installer/es/login.xml
index 7cc6ba6b..da8cb597 100644
--- a/docs/docs/stable/installer/es/login.xml
+++ b/docs/docs/stable/installer/es/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="es"><info><title xml:id="label-to-adapt-ti1">Pantalla de inicio de sesión</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>Pantalla de inicio de sesión de KDM</para></caption></mediaobject><para>Por último, se llega a la pantalla de inicio de sesión.</para><para>Ingrese su nombre de usuario y contraseña, y en pocos segundos se encontrará
-con un escritorio KDE o GNOME cargado, dependiendo del medio live que
-usó. Ahora puede comenzar a utilizar la instalación de Mageia.</para><para>Puede encontrar otra parte de nuestra documentación en <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">la wiki de
-Mageia</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="es">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/media_selection.xml b/docs/docs/stable/installer/es/media_selection.xml
index 449e8fef..e28c57a4 100644
--- a/docs/docs/stable/installer/es/media_selection.xml
+++ b/docs/docs/stable/installer/es/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="es">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Selección de medio (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Aquí tiene una lista de los repositorios disponibles. No todos los
 repositorios están disponibles, dependiendo de qué medio utilice para la
@@ -32,11 +41,11 @@ contiene la base de la distribución.</para>
     </listitem>
 
     <listitem>
-      <para>El repositorio <emphasis>Nonfree</emphasis> incluye paquetes que son gratis,
-es decir, Mageia puede redistribuirlos, pero que contienen software de
-código cerrado, de aquí el nombre Nonfree. Por ejemplo, este repositorio
-incluye controladores propietarios de tarjetas gráficas nVidia y ATI,
-firmware para diversas tarjetas WiFi, etc.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/es/minimal-install.xml b/docs/docs/stable/installer/es/minimal-install.xml
index 78742f2d..eaed36f8 100644
--- a/docs/docs/stable/installer/es/minimal-install.xml
+++ b/docs/docs/stable/installer/es/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="es">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="es">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Instalación mínima.</title>
   </info>
@@ -10,29 +13,44 @@
 
   
 
-  <para>Puede elegir una instalación mínima al de-seleccionar todo en la pantalla de
-selección de grupos de paquetes, ver.</para>
-
-  <para>Si lo desea, también puede marcar Opción de selección de paquete individual
-en la misma pantalla.</para>
-
-  <para>La instalación mínima está destinada a usos específicos para Mageia, como un
-servidor o una estación de trabajo especializada. Probablemente usará esta
-opción combinada con la opción de selección de paquete individual mencionada
-anteriormente, para ajustar su instalación, ver.</para>
+  
 
-  <para>Si elige este método de instalación, la pantalla correspondiente le ofrecerá
-algunos extras útiles para instalar, como documentación y X.</para>
+  
 
-  <para>Si ha elegido Con X, también se incluirá IceWM (un entorno de escritorio
-liviano).</para>
+  
 
-  <para>La documentación básica aparece en la forma de páginas man e info. Contiene
-las páginas de manuales del <link
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
-Project</link> y las páginas de información de <link
+Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
-coreutils</link>.</para>
+coreutils</link> info pages.</para>
 
   <mediaobject>
 <imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
diff --git a/docs/docs/stable/installer/es/misc-params.xml b/docs/docs/stable/installer/es/misc-params.xml
index bb62c329..291f9c2f 100644
--- a/docs/docs/stable/installer/es/misc-params.xml
+++ b/docs/docs/stable/installer/es/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="es" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Resumen de la Configuración</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
-
-  <para xml:id="misc-params-pa1" revision="1">DrakX presenta una propuesta para la configuración de su sistema en función
-de las elecciones que haya realizado y del hardware detectado. Puede
-verificar la configuración aquí y cambiarla si lo desea presionando
-Configurar</para>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+  <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>Como regla general, se recomienda que acepte la configuración predeterminada
@@ -26,8 +42,7 @@ a menos que:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>algún otro factor mencionado en las secciones detalladas a continuación es
-un problema.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -39,47 +54,48 @@ un problema.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Huso horario</guilabel>:</para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selecciona una zona horaria para usted, dependiendo de su idioma
-preferido. Puede cambiarlo si es necesario. Ver también</para>
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>País / Región</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">Si el país seleccionado es incorrecto, es muy importante que corrija la
 configuración. Ver</para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Cargador de arranque</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX ha hecho una buena elección para el cargador del arranque.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">No cambie nada, a menos que sepa cómo configurar GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Para más información, vea <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Administración de usuarios</guilabel>:</para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Aquí puede añadir más usuarios. Cada uno tendrá su propio directorio
-<literal>/home</literal>.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Servicios</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">Los servicios del sistema hacen referencia a esos pequeños programas que se
 ejecutan en segundo plano (daemons). Esta herramienta le permite habilitar o
 deshabilitar ciertos procesos.</para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Debe de pensar con mucho cuidado antes de cambiar nada aquí, una
-equivocación puede hacer que su ordenador no funcione correctamente.</para>
-
-        <para>Para obtener más información, consulte <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -91,7 +107,7 @@ equivocación puede hacer que su ordenador no funcione correctamente.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Teclado</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure su distribución de teclado de acuerdo con su ubicación, idioma y
 tipo de teclado.</para>
@@ -103,27 +119,32 @@ cuenta que las contraseñas cambiarán también.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Ratón</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Aquí puede añadir o configurar otros dispositivos señaladores, tablets,
 trackballs, etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Tarjeta de sonido</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">El instalador usa el controlador predeterminado, si lo hay. La opción de
-seleccionar un controlador diferente solo se proporciona cuando hay más de
-un controlador para su tarjeta, pero ninguno de ellos es el predeterminado.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Interfaz gráfica</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Esta sección le permite configurar sus tarjeta(s) gráficas y pantallas.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Para más información, vea <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -138,12 +159,12 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Red</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
-        <para xml:id="misc-params-network-pa2" revision="1">Puede configurar su red aquí, pero para las tarjetas de red con
-controladores no libres, es mejor hacerlo después de reiniciar, usando el
-Centro de Control Mageia, si aún no ha habilitado los repositorios de medios
-Nonfree.</para>
+        <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
+repositories.</para>
 
         <warning>
           <para xml:id="misc-params-network-pa3" revision="1">Cuando agregue una tarjeta de red, no olvide configurar su firewall para
@@ -152,14 +173,14 @@ monitorear esa interfaz también.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Servidores proxy</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">Un servidor proxy actúa como un intermediario entre su ordenador e
-Internet. Esta sección le permite configurar su ordenador para usar un
-servicio de proxy.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">Es posible que deba consultar a su administrador de sistemas para obtener
-los parámetros que necesita ingresar aquí.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -171,29 +192,31 @@ los parámetros que necesita ingresar aquí.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Nivel de seguridad</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Aquí puede configurar el nivel de seguridad que desee para su ordenador, en
-la mayoría de los casos, la configuración por defecto (Estándar) es adecuada
-para un uso general.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Marque la opción que se ajuste mejor al uso que le dé a su ordenador.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Cortafuegos</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">El propósito de un cortafuegos es ser una barrera entre sus archivos
-importantes y la gente malintencionada que pulula por Internet, quienes
-pueden intentar robar o comprometer sus archivos.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Seleccione los servicios que desea tener acceso a su sistema. Sus
-selecciones dependerán de lo que utilice su computadora. Para obtener más
-información, consulte <xref linkend="firewall" />.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">¡Tenga en cuenta de que permitiendo todo (sin cortafuegos) puede ser muy
-peligroso!</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/es/reboot.xml b/docs/docs/stable/installer/es/reboot.xml
index 8d70d557..80e6d026 100644
--- a/docs/docs/stable/installer/es/reboot.xml
+++ b/docs/docs/stable/installer/es/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="es" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Reiniciar</title>
   </info>
   
-  <para>Una vez que se haya instalado el gestor de arranque, se le pedirá que
-detenga su ordenador, retire el CD en vivo y reinicie el ordenador, haga
-clic en <emphasis role="bold"> <guibutton>Terminar</guibutton> </emphasis> y
-actúe como pidió <emphasis role="bold"> en este orden! </emphasis></para>
+  
+  <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>Cuando reinicie, verá una sucesión de barras de progreso de descarga. Estas
-indican que se están descargando las listas de medios de software (consulte
-Gestión de software).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/es/securityLevel.xml b/docs/docs/stable/installer/es/securityLevel.xml
index ca0f9c55..330ca164 100644
--- a/docs/docs/stable/installer/es/securityLevel.xml
+++ b/docs/docs/stable/installer/es/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="es" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Nivel de seguridad</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para>Por favor elija el nivel de seguridad deseado</para>
 
-  <para xml:id="securityLevel-pa1" revision="1">El estándar es la configuración predeterminada y recomendada para el usuario
-promedio. La configuración segura creará un sistema altamente protegido, por
-ejemplo, si el sistema se va a utilizar como servidor público.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para>Administrador de seguridad.</para>
 
-  <para xml:id="securityLevel-pa2" revision="1">Este elemento le permite configurar una dirección de correo electrónico a la
+  <para revision="1" xml:id="securityLevel-pa2">Este elemento le permite configurar una dirección de correo electrónico a la
 que el sistema enviará mensajes de alerta de seguridad cuando detecta
 situaciones que requieren notificación a un administrador del sistema.</para>
 
-  <para>Una opción buena y fácil de implementar es ingresar &lt;usuario> @localhost
-- donde &lt;usuario> es el nombre de inicio de sesión del usuario para
-recibir estos mensajes.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>El sistema envía tales mensajes como mensajes de Unix Mailspool, no como
@@ -35,6 +46,6 @@ correo SMTP "ordinario": ¡este usuario, por lo tanto, debe configurarse para
 recibir dicho correo!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">Después de la instalación, siempre será posible ajustar su configuración de
-seguridad en la Sección de seguridad del Centro de control de Mageia.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/es/selectCountry.xml b/docs/docs/stable/installer/es/selectCountry.xml
index c18aafb9..11ea5f3d 100644
--- a/docs/docs/stable/installer/es/selectCountry.xml
+++ b/docs/docs/stable/installer/es/selectCountry.xml
@@ -1,26 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="es">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="es">
   <info>
     <title xml:id="selectCountry-ti1">Seleccione su país / Región</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Elija su país o región. Esto es importante para todo tipo de
-configuraciones, como la moneda o la red wifi. Elegir el país incorrecto
-puede hacer que no pueda usar una red inalámbrica.</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+like the currency and wireless regulatory domain. Setting the wrong country
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">Si su país no está en la lista, haga clic en la opción "Otros países" y
-elija su país / región allí.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">Si su país está solo en la lista Otros países, después de hacer clic en
-Aceptar, puede parecer que se eligió un país de la primera lista. Por favor,
-ignore esto, ya que DrakX aplicará su elección real.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -28,19 +40,19 @@ ignore esto, ya que DrakX aplicará su elección real.</para>
       <title xml:id="inputMethod-ti7">Método de entrada</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">En la pantalla Otros países también puede seleccionar un método de entrada
-(en la parte inferior de la lista). Los métodos de entrada permiten a los
-usuarios ingresar caracteres multilingües (chino, japonés, coreano,
-etc.). IBus es el método de entrada predeterminado, por lo que los usuarios
-no deberían necesitar configurarlo manualmente. Otros métodos de entrada
-(SCIM, GCIN, HIME, etc.) también proporcionan funciones similares y pueden
-instalarse si usted agregó medios HTTP / FTP antes de la selección del
-paquete.</para>
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
+input method (at the bottom of the list). Input methods allow users to input
+multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
+default input method, so users should not need to configure it
+manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
+functions and can be installed if you added HTTP/FTP media before package
+selection.</para>
 
     <note>
-      <para xml:id="selectCountry-pa5" revision="1">Si olvidó la configuración del método de entrada durante la instalación,
-puede acceder a ella después de iniciar el sistema instalado a través de
-Configure su computadora -> Sistema, o ejecutando localedrake como root.</para>
+      <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/selectInstallClass.xml b/docs/docs/stable/installer/es/selectInstallClass.xml
index e6080e40..3a205c40 100644
--- a/docs/docs/stable/installer/es/selectInstallClass.xml
+++ b/docs/docs/stable/installer/es/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="es" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,53 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Instalar o actualizar</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Instalación</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use esta opción para realizar una nueva instalación de Mageia. Esto
-formateará la partición raíz (/), pero puede conservar una partición
-separada / home.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Actualización</para>
-
-      <para>Esto se puede usar para actualizar una instalación existente de Mageia.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Solo se ha probado exhaustivamente la actualización de una versión anterior
-de Mageia que todavía era compatible cuando se lanzó la versión de este
-instalador. Si desea actualizar una versión de Mageia que ha alcanzado su
-Fin de vida útil, entonces es mejor hacer una instalación limpia en su lugar
-mientras conserva su partición / home.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>Si durante la instalación decide detener la instalación, es posible
-reiniciar, pero por favor piense dos veces antes de hacer esto. Una vez que
-se ha formateado una partición o se han comenzado a instalar
-actualizaciones, su equipo ya no está en el mismo estado y reiniciarlo
-podría dejarlo con un sistema inutilizable. Si a pesar de eso, y solo si
-está seguro de que reiniciar es lo que desea, vaya a un terminal de texto
-presionando
-Alt Ctrl F2 simultáneamente. Después de eso, presione Alt Ctrl Eliminar
-simultáneamente para reiniciar.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
-    <para>Si ha descubierto que olvidó seleccionar un idioma adicional, puede regresar
-del "Instale o actualice la pantalla" a la pantalla de selección de idioma
-presionando Alt Ctrl Inicio simultáneamente. No haga esto más tarde en la
-instalación.</para>
+    <para>If you have discovered that you forgot to select an additional language, you
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/es/selectKeyboard.xml b/docs/docs/stable/installer/es/selectKeyboard.xml
index 926fdb23..c4a5f52a 100644
--- a/docs/docs/stable/installer/es/selectKeyboard.xml
+++ b/docs/docs/stable/installer/es/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="es">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,19 +19,22 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Teclado</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX selecciona el teclado apropiado a su idioma. Si no encuentra ningún
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX selecciona el teclado apropiado a su idioma. Si no encuentra ningún
 teclado compatible, elegirá el teclado estadounidense.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Asegúrese de que la selección es la correcta o escoja otra distribución del
+      <para revision="1" xml:id="selectKeyboard-pa2">Asegúrese de que la selección es la correcta o escoja otra distribución del
 teclado. Si no conoce cuál es la distribución correcta para su teclado, mire
 en las especificaciones que venían con su sistema o pregunte a su vendedor.
 Incluso puede haber una etiqueta en su teclado que la identifique.También
@@ -27,21 +43,22 @@ xlink:href="http://es.wikipedia.org/wiki/Distribuci%C3%B3n_del_teclado">es.wikip
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">Si su teclado no está en la lista que se muestra, haga clic en "Más" para
-obtener una lista más completa, y seleccione su teclado allí.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">Después de elegir un teclado del apartado "Más", volverá al primer apartado
-de elección de teclado y parecerá que se eligió un teclado de esa
-pantalla. Puede ignorar esto y continuar la instalación de forma segura: se
-aplicará el teclado elegido de la lista completa.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">Si elige un teclado basado en caracteres no latinos, verá una pantalla de
+      <para revision="1" xml:id="selectKeyboard-pa4">Si elige un teclado basado en caracteres no latinos, verá una pantalla de
 diálogo extra preguntando cómo prefiere cambiar entre los diseños de teclado
 latino y no latino.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/es/selectKeyboardLive.xml b/docs/docs/stable/installer/es/selectKeyboardLive.xml
index d5534841..23f17aea 100644
--- a/docs/docs/stable/installer/es/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/es/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="es" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Seleccionar teclado</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>Se le pedirá que defina el teclado que quiere usar en Mageia. Por defecto
-aparece el correspondiente al idioma y la zona horaria previamente
-seleccionados.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/es/selectLanguage.xml b/docs/docs/stable/installer/es/selectLanguage.xml
index fa5a7b73..7388c44b 100644
--- a/docs/docs/stable/installer/es/selectLanguage.xml
+++ b/docs/docs/stable/installer/es/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="es" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,50 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Por favor elija un idioma</title>
   </info>
 
-  <para condition="classical">Elija su idioma preferido extendiendo la lista de su continente.
-<application>Mageia</application> usará esta selección durante la
-instalación y para su sistema instalado.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Seleccione su idioma preferido.  <application>Mageia</application> lo usará
-durante la instalación y en su sistema instalado.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">Si es probable que usted (u otros) necesite instalar varios idiomas en su
-sistema, entonces debe usar "Opción de idiomas múltiples" para agregarlos
-ahora. Será difícil agregar soporte de idioma adicional después de la
-instalación.</para>
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
-    <para>Incluso si elige más de un idioma, primero debe elegir uno como idioma
-preferido en la pantalla del primer idioma. También se marcará como elegido
-en la pantalla de idiomas múltiples.</para>
-  </warning>
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
-      <para>Si su teclado no es de su idioma preferido, es recomendable que instale
-también el idioma de su teclado.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia usa soporte UTF-8 (Unicode) por defecto.</para>
-
-      <para condition="classical">Esto puede ser deshabilitado en la pantalla de "Idiomas múltiples" si sabe
-que no es apropiado para su idioma. La desactivación de UTF-8 se aplica a
-todos los idiomas instalados.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>Se puede cambiar el idioma del sistema tras la instalación en Centro de
-Control de Mageia > Sistema > Administrar la localizacón para su sistema.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/es/selectMouse.xml b/docs/docs/stable/installer/es/selectMouse.xml
index 33d1fee0..3fd4b12c 100644
--- a/docs/docs/stable/installer/es/selectMouse.xml
+++ b/docs/docs/stable/installer/es/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="es">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Elección del ratón</title>
   </info>
@@ -7,25 +13,28 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata align="center" fileref="../es/dx2-selectMouse.png"
-format="PNG" /> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Si el ratón no responde correctamente, aquí puede elegir uno diferente.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Normalmente, <guilabel>Universal</guilabel> - <guilabel>Cualquier ratón PS/2
-y ratones USB</guilabel> es la mejor elección.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Seleccione <guilabel>Universal</guilabel> - <guilabel>Forzar
-evdev</guilabel> para configurar los botones que no funcionan en un ratón de
-seis o más botones.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/es/setupBootloader.xml b/docs/docs/stable/installer/es/setupBootloader.xml
index 5f2d8d50..deb27b51 100644
--- a/docs/docs/stable/installer/es/setupBootloader.xml
+++ b/docs/docs/stable/installer/es/setupBootloader.xml
@@ -1,152 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="es" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="es" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Opciones principales del cargador de arranque</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Interfaz del cargador de arranque</title>
-    <para>Por defecto, Mageia usa exclusivamente:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (con o sin menú gráfico) para un sistema Legacy / MBR o Legacy / GPT</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi para un sistema UEFI.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>Los menús gráficos de Mageia son buenos y bonitos :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 en sistemas Legacy / MBR y Legacy / GPT</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>No modifique el dispositivo de arranque a menos que realmente sepa lo que
-está haciendo.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi en sistemas UEFI</title>
-      <para>Con un sistema UEFI, la interfaz de usuario es ligeramente diferente ya que
-no puede elegir entre las opciones "con o sin menú gráfico".</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>Si Mageia es el único sistema instalado en su computadora, el instalador
-creó un ESP (Partición de sistema EFI) para alojar el gestor de arranque
-(GRUB2-efi). Si ya hay sistemas operativos UEFI instalados en su computadora
-(Windows 8 por ejemplo), el instalador de Mageia detecta el ESP existente
-creado por Windows y agrega GRUB2-efi. Aunque es posible tener varios ESP,
-solo se requiere uno (y se recomienda), independientemente de la cantidad de
-sistemas operativos que tenga.</para>
-      <para>No modifique el dispositivo de arranque a menos que realmente sepa lo que
-está haciendo.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Usando el cargador de arranque de Mageia</title>
-    <para>De forma predeterminada, y de acuerdo con su sistema, Mageia escriba uno de
-los siguientes:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>un gestor de arranque GRUB2 en el MBR (Master Boot Record) de su primer
-disco duro o en la partición de arranque del BIOS.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>un gestor de arranque GRUB2-efi en el ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>Si ya tiene instalados otros sistemas operativos, Mageia intenta agregarlos
-al nuevo menú de inicio de Mageia. Si no quiere este comportamiento, haga
-clic en "A continuación", desmarque la opción "Buscar otros sistemas
-operativos".</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Usando un cargador de arranque existente</title>
-    <para>El procedimiento exacto para agregar su sistema Mageia a un gestor de
-arranque existente está fuera del alcance de esta documentación, sin
-embargo, en la mayoría de los casos implicará ejecutar el programa de
-instalación del gestor de arranque correspondiente, que debería detectarlo y
-agregarlo automáticamente. Consulte la documentación del sistema operativo
-en cuestión.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Carga en uso</title>
-    <para>Si no quiere un arranque de Mageia, sino que se incie desde otro sistema
-operativo, haga clic en "A continuación", luego en Avanzado y marque la
-casilla No toque ESP o MBR.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>Obtendrá una advertencia de que falta el cargador de arranque, ignórelo
-haciendo clic en <guibutton>Aceptar</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
   </section>
   <section>
-    <title>Opciones</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>Primera página</title>
-      <para><itemizedlist><listitem><para>Retraso antes de iniciar la imagen predeterminada: esto le permite
-establecer un retraso en segundos antes de que se inicie el sistema
-operativo predeterminado.</para></listitem><listitem><para>Seguridad: esto le permite establecer una contraseña para el gestor de
-arranque. Esto significa que se requerirá un nombre de usuario y una
-contraseña al arrancar para seleccionar una entrada de inicio o cambiar la
-configuración. El nombre de usuario es root y la contraseña es la que se
-elige aquí después.</para></listitem><listitem><para>Contraseña: elija una contraseña para el gestor de arranque.</para></listitem><listitem><para>Contraseña (nuevamente): Vuelva a escribir la contraseña y DrakX verificará
-que coincida con la anterior.</para></listitem><listitem><para><guilabel>Avanzado</guilabel></para><itemizedlist><listitem><para>Habilitar ACPI: ACPI (Configuración avanzada e interfaz de alimentación) es
-un estándar para la administración de energía. Puede ahorrar energía al
-detener dispositivos no utilizados. Anular la selección podría ser útil si,
-por ejemplo, su computadora no admite ACPI o si cree que la implementación
-de ACPI podría causar algunos problemas (por ejemplo, reinicios aleatorios o
-bloqueos del sistema).</para></listitem><listitem><para>Habilitar SMP: esta opción habilita / deshabilita el multiprocesamiento
-simétrico para procesadores multinúcleo.</para></listitem><listitem><para>Habilite APIC: Esto le da acceso al sistema operativo al Controlador de
-interrupción programable avanzado. Los dispositivos APIC permiten modelos de
-prioridad más complejos y administración avanzada de IRQ (solicitud de
-interrupción).</para></listitem><listitem><para>Habilite el APIC local: el APIC local administra todas las interrupciones
-externas para un procesador específico en un sistema SMP.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Opciones principales del cargador de arranque</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Página siguiente</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Predeterminado:</guilabel> Sistema operativo iniciado de forma
-predeterminada</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Añadir:</guilabel> Esta opción le permite pasar la información del
-kernel o decirle al núcleo que le proporcione más información a medida que
-arranca.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Detección de otros sistemas operativos</guilabel>: ver arriba
-<link linkend="setupMageiaBootloader"> Utilizar un gestor de arranque Mageia
-</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Avanzado</guilabel><itemizedlist><listitem><para>Modo de video: establece el tamaño de pantalla y la profundidad de color que
-usará el menú de inicio. Si hace clic en el triángulo hacia abajo, se le
-ofrecerán otras opciones de tamaño y profundidad de color.</para></listitem><listitem><para><emphasis role="bold">No toque ESP o MBR</emphasis>: ver arriba <link
-linkend="setupChainLoading">Uso de la cadena de arranque</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Usando un cargador de arranque existente</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Agregando o modificando una entrada en el menú de arranque</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/setupSCSI.xml b/docs/docs/stable/installer/es/setupSCSI.xml
index 14b983af..f8e55cd9 100644
--- a/docs/docs/stable/installer/es/setupSCSI.xml
+++ b/docs/docs/stable/installer/es/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="es">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Configurando SCSI</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,16 +37,17 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX normalmente detectará los discos duros correctamente. Sin embargo, con
 algunos controladores SCSI más antiguos, es posible que no pueda determinar
 los controladores correctos que se utilizarán y, posteriormente, no
 reconocerá la unidad.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">Si esto sucede, tendrá que decirle manualmente a DrakX qué unidad (es) SCSI
-tiene.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">Después DrakX debería de poder configurar el(los) disco(s) correctamente.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/es/software.xml b/docs/docs/stable/installer/es/software.xml
new file mode 100644
index 00000000..b318c909
--- /dev/null
+++ b/docs/docs/stable/installer/es/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="es" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/es/soundConfig.xml b/docs/docs/stable/installer/es/soundConfig.xml
index 90b9a8ad..8b12520c 100644
--- a/docs/docs/stable/installer/es/soundConfig.xml
+++ b/docs/docs/stable/installer/es/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="es">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Configurar el sonido</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>En esta pantalla, se proporciona el nombre del controlador que el instalador
-eligió para su tarjeta de sonido, que será el controlador predeterminado si
-existe.</para>
+  
 
-  <para>El driver por defecto debería funcionar sin problemas. Sin embargo, si tras
-la instalación hay problemas, ejecute <command>draksound</command> o inicie
-esta herramienta vía MCC (Centro de Control de Mageia), escogiendo la
-etiqueta <guilabel>Hardware</guilabel> y haciendo click en
-<guilabel>Configurar Sonido</guilabel> en la esquina superior derecha de la
-pantalla.</para>
+  
 
-  <para>Entonces, en el Draksound o la pantalla de la herramienta de configuración
-de sonido, haga clic en Solución de problemas para encontrar consejos útiles
-sobre cómo resolver el problema.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Avanzado</title>
     </info>
 
-    <para>Haciendo clic "Avanzado" en esta pantalla, durante la instalación, es útil
-si no hay un controlador predeterminado y hay varios controladores
-disponibles, pero piense si el instalador seleccionó el incorrecto.</para>
-
-    <para>En ese caso, puede seleccionar un controlador diferente después de hacer
-clic en "Dejarme elegir cualquier controlador".</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/es/takeOverHdConfirm.xml b/docs/docs/stable/installer/es/takeOverHdConfirm.xml
index 914dc4da..604d5c14 100644
--- a/docs/docs/stable/installer/es/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/es/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="es">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Confirme el disco que va a formatear</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,14 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Haga clic en "Anterior" si no está seguro de su elección.</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
+choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Haga clic en "Siguiente", proceda si está seguro de que está bien borrar
-todas las particiones, todos los sistemas operativos y todos los datos que
-puedan estar en ese disco duro.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/es/testing.xml b/docs/docs/stable/installer/es/testing.xml
index 2f569096..4238af55 100644
--- a/docs/docs/stable/installer/es/testing.xml
+++ b/docs/docs/stable/installer/es/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Probar Mageia como sistema Live</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Probar Mageia como sistema Live</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,21 +17,20 @@
       <title xml:id="testing1-ti1">Modo Live</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>Obtiene esta pantalla si seleccionó "Arrancar Mageia". Si no, obtiene el
-"paso de <link linkend="doPartitionDisks">particionado</link>"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Probar hardware</title>
       </info>
 
-      <para>Uno de los objetivos del modo Live es probar si Mageia administra
-correctamente el hardware. Ud puede verificar si todos los dispositivos
-tienen un controlador en la sección Hardware del Centro de Control de
-Mageia. Puede probar los dispositivos más actuales:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -36,11 +38,7 @@ Mageia. Puede probar los dispositivos más actuales:</para>
         </listitem>
 
         <listitem>
-          <para>tarjeta gráfica: si ve la pantalla anterior, ya está OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>cámara web:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -48,7 +46,7 @@ Mageia. Puede probar los dispositivos más actuales:</para>
         </listitem>
 
         <listitem>
-          <para>impresora: configúrela e imprima una página de prueba</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -56,11 +54,13 @@ Mageia. Puede probar los dispositivos más actuales:</para>
         </listitem>
       </itemizedlist>
 
-      <para>Si todo está bien, puede procesar la instalación. Si no, puede cancelar con
-el botón abandonar.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>Los valores de configuración que Ud estableció aquí, se mantienen durante la
-instalación.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -68,15 +68,14 @@ instalación.</remark>
         <title xml:id="testing3-ti1">Iniciar la instalación</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>Para iniciar la instalación del LiveCD o LiveDVD de Mageia en en disco duro
-o unidad SSD, simplemente haga click en el icono "Instalar en Disco
-Duro". Obtendrá la pantalla correspondiente y a continuación el "paso de
-<link linkend="doPartitionDisks">Particionar</link>" a la instalación
-directa.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/es/uninstall-Mageia.xml b/docs/docs/stable/installer/es/uninstall-Mageia.xml
index 98919974..8293935b 100644
--- a/docs/docs/stable/installer/es/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/es/uninstall-Mageia.xml
@@ -1,32 +1,44 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="es">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="es" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Desinstalando Mageia</title>
   </info>
 
   
 
+  
+
   <para>Si Mageia no lo convenció o no puede instalarlo correctamente, en resumen,
 quiere deshacerse de él, ése es su derecho y Mageia también le ofrece la
 posibilidad de desinstalarlo. Esto no es cierto para todos los sistemas
 operativos.</para>
 
-  <para>Después de su copia de seguridad de datos, reinicie su DVD de instalación de
-Mageia y seleccione "Sistema de rescate", entonces, restaure el cargador de
-arranque de Windows. En el siguiente arranque, solo tendrá Windows, sin
-opción de elegir su sistema operativo.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>En Windows para recuperar el espacio utilizado por las particiones de
-Mageia: haga clic en
-Inicio -> Panel de control -> Herramientas administrativas -> Administración
-de equipos -> Almacenamiento -> Administración de discos. Reconocerá una
-partición de Mageia porque están etiquetadas como desconocidas, y también
-por su tamaño y lugar en el disco. Haga clic derecho en cada una de estas
-particiones y seleccione Eliminar para liberar el espacio.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-  <para>Si tienes XP, puedes crear una nueva partición y darle formato (FAT32 o
-NTFS). Se obtendrá una letra de partición.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>Si tiene Vista o 7, tiene una posibilidad más, puede extender la partición
 existente que está a la izquierda del espacio liberado. Hay otras
@@ -34,4 +46,4 @@ herramientas de particionamiento que se pueden usar, como gparted,
 disponible para Windows y Linux. Como siempre, al cambiar las particiones,
 tenga mucho cuidado de hacer copias de seguridad de todo lo que sea
 importante para usted.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/es/unused.xml b/docs/docs/stable/installer/es/unused.xml
index 46cdce3d..0fa975b2 100644
--- a/docs/docs/stable/installer/es/unused.xml
+++ b/docs/docs/stable/installer/es/unused.xml
@@ -1,28 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="es" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="es">
   <info>
     <title xml:id="unused-ti1">Mantener o eliminar el material no usado</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
 
-  <para>En este paso, el instalador busca paquetes de idioma y paquetes de hardware
-no utilizados. A continuación, le proponer eliminarlos. Es aconsejable
-aceptar, excepto si prepara una instalación que tiene que ejecutarse en
-hardware diferente.</para>
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>El siguiente paso es copiar los archivos al disco rígido. Esto toma algunos
-minutos. Al final se obtiene una pantalla en blanco durante algún tiempo. Es
-normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/et/DrakLive-cover.xml b/docs/docs/stable/installer/et/DrakLive-cover.xml
index 12834226..ee14f3d5 100644
--- a/docs/docs/stable/installer/et/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/et/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="et" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="et" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Paigaldamine Live-andmekandjalt</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Jaanuar 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Paigaldamine Live-andmekandjalt</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageia ametlik dokumentatsioon</para>
+      <para role="tagline">Mageia ametlik dokumentatsioon</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Käsiraamatu tekst ja ekraanipildid on litsenseeritud vastavalt CC BY-SA 3.0
+
+      <para>Käsiraamatu tekst ja ekraanipildid on litsenseeritud vastavalt CC BY-SA 3.0
 litsentsile <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-            </para>
-            <para>Käsiraamat on valmistatud <link ns6:href="http://www.calenco.com">Calenco
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Käsiraamat on valmistatud <link ns6:href="http://www.calenco.com">Calenco
 CMS</link>'i abil, mille on välja töötanud <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-            </para>
-            <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
 soovite kaasa aidata käsiraamatu paremaks muutmisele, võtke ühendust <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</link>.</para> 
+ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</link>.</para>
     </cover>
   </info>
+
   <article>
     <title>Paigaldamine Live-andmekandjalt</title>
-       <para><note>
-          <para>Keegi ei näe kõiki käsiraamatus toodud paigaldusprogrammi ekraane.  See,
+
+    <para><note>
+        <para>Keegi ei näe kõiki käsiraamatus toodud paigaldusprogrammi ekraane.  See,
 millised ekraanid on näha, sõltub teie riistvarast ja paigaldamise käigus
 langetatud valikutest.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/et/DrakLive.xml b/docs/docs/stable/installer/et/DrakLive.xml
index 15ab000b..9cfd737d 100644
--- a/docs/docs/stable/installer/et/DrakLive.xml
+++ b/docs/docs/stable/installer/et/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="et" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="et" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Paigaldamine Live-andmekandjalt</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Paigaldamine Live-andmekandjalt</title>
 
     <cover>
       <para><note>
@@ -17,9 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 CMS</link>'i abil, mille on välja töötanud <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
-soovite kaasa aidata käsiraamatu paremaks muutmisele, võtke ühendust <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</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>
 
@@ -39,7 +54,12 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +69,18 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/et/DrakX-cover.xml b/docs/docs/stable/installer/et/DrakX-cover.xml
index f82a001e..5eba518a 100644
--- a/docs/docs/stable/installer/et/DrakX-cover.xml
+++ b/docs/docs/stable/installer/et/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="et" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="et" xml:id="Quick-Startup"
+      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>Paigaldamine DrakX'i abil</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Veebruar 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Veebruar 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageia ametlik dokumentatsioon</para>
+      <para role="tagline">Mageia ametlik dokumentatsioon</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>Käsiraamatu tekst ja ekraanipildid on litsenseeritud vastavalt CC BY-SA 3.0
+
+      <para>Käsiraamatu tekst ja ekraanipildid on litsenseeritud vastavalt CC BY-SA 3.0
 litsentsile <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Käsiraamat on valmistatud <link ns6:href="http://www.calenco.com">Calenco
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Käsiraamat on valmistatud <link ns6:href="http://www.calenco.com">Calenco
 CMS</link>'i abil, mille on välja töötanud <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
 soovite kaasa aidata käsiraamatu paremaks muutmisele, võtke ühendust <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</link>.</para> 
+ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</link>.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Paigaldamine DrakX'i abil</title>
-       <para><note>
-          <para>Keegi ei näe kõiki käsiraamatus toodud paigaldusprogrammi ekraane.  See,
+
+    <para><note>
+        <para>Keegi ei näe kõiki käsiraamatus toodud paigaldusprogrammi ekraane.  See,
 millised ekraanid on näha, sõltub teie riistvarast ja paigaldamise käigus
 langetatud valikutest.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ langetatud valikutest.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/et/DrakX-inline.xml b/docs/docs/stable/installer/et/DrakX-inline.xml
new file mode 100644
index 00000000..b73cb5c9
--- /dev/null
+++ b/docs/docs/stable/installer/et/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="et" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Paigaldamine DrakX'i abil</title>
+
+    <cover>
+      <para><note>
+          <para>Keegi ei näe kõiki käsiraamatus toodud paigaldusprogrammi ekraane.  See,
+millised ekraanid on näha, sõltub teie riistvarast ja paigaldamise käigus
+langetatud valikutest.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Käsiraamatu tekst ja ekraanipildid on litsenseeritud vastavalt CC BY-SA 3.0
+litsentsile <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Käsiraamat on valmistatud <link ns6:href="http://www.calenco.com">Calenco
+CMS</link>'i abil, mille on välja töötanud <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Käsiraamatu on kirjutanud ja tõlkinud vabatahtlikud oma vabast ajast. Kui
+soovite kaasa aidata käsiraamatu paremaks muutmisele, võtke ühendust <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskonnaga</link>.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/DrakX.xml b/docs/docs/stable/installer/et/DrakX.xml
index 63041419..7dd6941f 100644
--- a/docs/docs/stable/installer/et/DrakX.xml
+++ b/docs/docs/stable/installer/et/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="et" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="et" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Paigaldamine DrakX'i abil</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Paigaldamine DrakX'i abil</title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">dokumentatsioonimeeskon
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/et/SelectAndUseISOs2.xml b/docs/docs/stable/installer/et/SelectAndUseISOs2.xml
index d5239aeb..2970b3a7 100644
--- a/docs/docs/stable/installer/et/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/et/SelectAndUseISOs2.xml
@@ -1,37 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="et" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">ISO-tõmmise valimine ja kasutamine</title>
   </info>
   <section>
     <title>Sissejuhatus</title>
     <para>Mageiat levitatakse ISO-tõmmiste kaudu. Siin leiab abi valimaks just sellist
 tõmmist, mis vastab teie vajadustele.</para>
-    <para>Andmekandjaid on kaht tüüpi:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Klassikaline paigaldusandmekandja. See annab maksimaalse paindlikkuse ja
-lubab luua kohandatud paigalduse, eriti just valida, millist töökeskkonda
-kasutama hakata.</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>Live-andmekandja: sel juhul saab andmekandja pealt käivitada toimiva Mageia
-süsteemi ilma seda paigaldamata, et näiteks näha, mida üldse
-pakutakse. Paigaldamine on lihtsam, aga ka valikuid on vähem.</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>Need andmekandjad on väga väikesed (alla 100 MB) ja abiks siis, kui
+internetiühenduse maht on liiga väike terve DVD allalaadimiseks, arvuti on
+ilma DVD-seadmeta või ei saa arvutit käivitada USB-pulga pealt.</para>
       </listitem>
     </itemizedlist>
-    <para>Üksikasjadest kõneldakse järgmistes osades.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Andmekandjad</title>
     <section>
       <title>Määratlus</title>
-      <para>Me nimetame siinkohal andmekandjaks ISO-tõmmisefaili, mis võimaldab
-paigaldada ja/või uuendada Mageiat, ning ühtlasi ka igasugust füüsilist
-seadet, millele ISO-tõmmis on kopeeritud (DVD, USB-pulk jne.).</para>
+      <para>Here, a medium (plural: media) is an ISO image file that allows you to
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>Mageia ISO-tõmmised leiab <link
 ns4:href="http://www.mageia.org/en/downloads/">siit</link>.</para>
     </section>
@@ -41,24 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">siit</link>.</para>
         <title>Ühised omadused</title>
         <itemizedlist>
           <listitem>
-            <para>Kasutavad traditsioonilist paigaldusprogrammi drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
-            <para>Saab teha nii puhta paigalduse kui ka uuendada varasematelt väljalasetelt.</para>
+            <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Eri andmekandjad 32- ja 64-bitisele arhitektuurile.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Tervitusekraanil on saada mõned tööriistad: päästesüsteem, mälu testimine,
-riistvara tuvastamise tööriist.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Iga DVD sisaldab paljusid saadaolevaid töökeskkondi ja keeli.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Paigaldamise käigus lastakse valida, kas kasutada mittevaba tarkvara või
-mitte.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -69,21 +106,20 @@ mitte.</para>
         <title>Ühised omadused</title>
         <itemizedlist>
           <listitem>
-            <para>Saab tarvitada distributsiooni tundmaõppimiseks ilma seda kohe kõvakettale
-paigaldamata, aga soovi korral siiski ka Mageia paigaldamiseks.</para>
+            <para>Can be used to preview the Mageia operating system without having to install
+it</para>
           </listitem>
           <listitem>
-            <para>Iga ISO sisaldab ainult üht töökeskkonda (Plasma, GNOME või Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Eri andmekandjad 32- ja 64-bitisele arhitektuurile.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">LiveISO-sid saab kasutada ainult puhta paigalduse,
-mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Sisaldavad mittevaba tarkvara.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -91,13 +127,13 @@ mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis></para>
         <title>Plasma LiveDVD</title>
         <itemizedlist>
           <listitem>
-            <para>Ainult Plasma töökeskkond.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Sisaldab kõiki keeli.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Ainult 64-bitine arhitektuur.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -105,13 +141,13 @@ mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis></para>
         <title>GNOME LiveDVD</title>
         <itemizedlist>
           <listitem>
-            <para>Ainult GNOME töökeskkond.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Sisaldab kõiki keeli.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Ainult 64-bitine arhitektuur.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -119,13 +155,13 @@ mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis></para>
         <title>Xfce LiveDVD</title>
         <itemizedlist>
           <listitem>
-            <para>Ainult Xfce töökeskkond.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Sisaldab kõiki keeli.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32- või 64-bitine arhitektuur.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -136,22 +172,10 @@ mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis></para>
         <title>Ühised omadused</title>
         <itemizedlist>
           <listitem>
-            <para>Need on väikesed tõmmised, mis sisaldavad vaid tarkvara, mida on vaja
-paigaldusprogrammi drakx käivitamiseks ning drakx-installer-stage2 ja veel
-mõningate pakettide leidmiseks, et siis jätkata paigaldamisega. Need paketid
-võivad asuda arvuti kõvakettal, mõnel muul kohalikul kettal, kohalikus
-võrgus või internetis.</para>
-          </listitem>
-          <listitem>
-            <para>Need andmekandjad on väga väikesed (alla 100 MB) ja abiks siis, kui
-internetiühenduse maht on liiga väike terve DVD allalaadimiseks, arvuti on
-ilma DVD-seadmeta või ei saa arvutit käivitada USB-pulga pealt.</para>
-          </listitem>
-          <listitem>
-            <para>Eri andmekandjad 32- ja 64-bitisele arhitektuurile.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Esimesed sammud on ainult inglise keeles.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -159,8 +183,8 @@ ilma DVD-seadmeta või ei saa arvutit käivitada USB-pulga pealt.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Sisaldab ainult vaba tarkvara neile, kes ei ole nõus mittevaba tarkvara
-kasutama.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -168,8 +192,7 @@ kasutama.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Sisaldab mittevaba tarkvara (peamiselt draiverid, koodekid jms.) neile, kes
-seda vajavad.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -179,71 +202,89 @@ seda vajavad.</para>
     <title>Andmekandja allalaadimine ja kontrollimine</title>
     <section>
       <title>Allalaadimine</title>
-      <para>Kui olete sobiva ISO-faili valinud, saab selle alla laadida kas HTTP või
-BitTorrenti vahendusel. Mõlemal juhul annab aken mõningat teavet, näiteks
-kasutatava peegelsaidi ja võimaluse kohta seda vahetada, kui ribalaius on
-liiga väike. HTTP valimise korral peaks pilt olema umbes selline:</para>
+      <para>Once you have chosen your ISO file, you can download it using either http or
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum ja sha1sum on tööriistad ISO terviklikkuse kontrollimiseks. Kasutada
-tuleks ainult üht neist. Hoidke üks neist varuks <link
-linkend="integrity">edasiseks kasutamiseks</link>. Seejärel ilmub selline
-aken:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Valige faili salvestamine ja klõpsake OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Allalaaditud andmekandja terviklikkuse kontrollimine</title>
-      <para>Mõlemad kontrollsummad on kuueteistkümnendarvud, mis arvutatakse kindla
-algoritmiga allalaaditava faili põhjal. Kui paluda algoritmil arv uuesti
-leida allalaaditud faili põhjal, saab tulemuseks kas sama arvu, mis
-tähendab, et allalaaditud fail on korras, või siis mõne muu arvu, mis
-tähendab, et see ei ole korras. Viimasel juhul tuleks fail uuesti alla
-laadida või püüda see BitTorrenti abil parandada.</para>
+      <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>Alla laaditud ISO-tõmmise kontrollsumma genereerimiseks avage konsool
 (selleks ei pea olema administraator) ja kirjutage:</para>
       <itemizedlist>
         <listitem>
-          <para>- md5sum kasutamiseks: <userinput>md5sum
-tõmmisefail.iso/asukoht</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>- sha1sum kasutamiseks: <userinput>sha1sum
-tõmmisefail.iso/asukoht</userinput>.</para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Näide:</para>
+      <para>Näide:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>ja võrrelge arvutis saadud arvu (võimalik, et peate natuke ootama) Mageia
-allalaadimissaidil näidatuga.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>ISO kirjutamine</title>
-    <para>Kontrollitud ISO võib nüüd kirjutada CD-le, DVD-le või USB-pulgale. See ei
-ole tavaline kopeerimine, vaid eesmärk on luua käivitatav andmekandja.</para>
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
     <section>
       <title>ISO kirjutamine CD-le või DVD-le</title>
-      <para>Kasutage soovikohast kirjutamisprogrammi, aga kontrollige kindlasti, et
-seade oleks määratud <emphasis role="bold">kirjutama tõmmist</emphasis>,
-mitte aga <emphasis role="bold">andmeid</emphasis> või <emphasis
-role="bold">faile</emphasis>. Rohkem teavet leiab <link
-ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">Mageia
-wikist</link>.</para>
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
+ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
+wiki</link> for more information.</para>
     </section>
     <section>
       <title>ISO kirjutamine USB-pulgale</title>
-      <para>Kõik Mageia ISO-d on hübriidsed, mis tähendab, et neid saab kirjutada ka
-USB-pulgale, mis on käivitatav ja mille pealt saab süsteemi paigaldada.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>Tõmmise kirjutamine USB-pulgale hävitab kõik varasemad failisüsteemid
-seadmes, kõik andmed lähevad kaotsi ja partitsiooni suurus väheneb tõmmise
-suurusele.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>Algse mahu taastamiseks tuleb USB-pulk uuesti partitsioneerida ja
-vormindada.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Graafilise tööriista kasutamine Mageias</title>
         <para>Kasutada võib mõnda graafilist tööriista, näiteks <link
@@ -254,8 +295,8 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <para>Võite proovida järgmisi programme:</para>
         <itemizedlist>
           <listitem>
-            <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> valikuga
-"ISO image";</para>
+            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
@@ -264,7 +305,7 @@ Disk Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Käsurea kasutamine GNU/Linuxi süsteemis</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>Käsitsi toimetamine on potentsiaalselt *ohtlik*. Kui seadme ID valesti anda,
 võib ketta partitsiooni sootuks üle kirjutada.</para>
@@ -274,26 +315,28 @@ võib ketta partitsiooni sootuks üle kirjutada.</para>
             <para>Avage konsool</para>
           </listitem>
           <listitem>
-            <para>Võtke administraatori õigused käsuga <userinput>su -</userinput> (ärge
-unustage kriipsukest lõpus)</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Ühendage USB-pulk (ärge haakige seda, see tähendab ärge avage ühtegi
-rakendust või failihaldurit, mis seda lugeda võiks)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Sisestage käsk <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Leidke oma USB-pulga seadmenimi (suuruse järgi); näiteks toodud pildil on
-selleks <code>/dev/sdb</code>, mis on 8 GB suurune USB-pulk.</para>
-            <para>Teine võimalus on leida seadme nimi käsuga <code>dmesg</code>: lõpus näeb
-seadme nime, mille alguses seisab <emphasis>sd</emphasis>, antud juhul
-<emphasis>sdd</emphasis>; samuti on näha, et suurus on 2GB:</para>
+            <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+            <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
@@ -314,22 +357,22 @@ seadme nime, mille alguses seisab <emphasis>sd</emphasis>, antud juhul
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Sisestage käsk <emphasis role="bold"># <userinput>dd if=ISO-faili/asukoht
-of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>kus X on teie seadme nimi, nt: /dev/sdd</para>
-            <para>Näide: <emphasis role="bold"># <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>Võib-olla tasub teada sedagi, et <emphasis role="bold">if</emphasis>
-tähendab<emphasis role="bold">i</emphasis>nput <emphasis
-role="bold">f</emphasis>ile'i ehk eesti keeli sisendfaili ja <emphasis
-role="bold">of</emphasis> omakorda <emphasis role="bold">o</emphasis>utput
-<emphasis role="bold">f</emphasis>ile'i ehk väljundfaili.</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Sisestage käsk: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>See ongi kõik: nüüd võib USB-pulga välja võtta.</para>
@@ -338,4 +381,4 @@ role="bold">of</emphasis> omakorda <emphasis role="bold">o</emphasis>utput
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/acceptLicense.xml b/docs/docs/stable/installer/et/acceptLicense.xml
index 81477d9f..47ad4725 100644
--- a/docs/docs/stable/installer/et/acceptLicense.xml
+++ b/docs/docs/stable/installer/et/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Litsents ja väljalaskemärkmed</title>
   </info>
 
@@ -46,17 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">Litsentsileping</title>
     </info>
 
-    <para>Enne <application>Mageia</application> paigaldamist lugege palun hoolikalt
-läbi litsentsi tingimused.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Need tingimused kehtivad kogu <application>Mageia</application>
-distributsioonile ja enne jätkamist tuleb nendega nõustuda.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Jätkamiseks valige lihtsalt <guilabel>Nõustun</guilabel> ja klõpsake siis
-<guibutton>Edasi</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Kui te aga ei ole tingimustega nõus, siis täname teid huvi eest.  Klõps
-nupule <guibutton>Välju</guibutton> taaskäivitab arvuti.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -74,7 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Olulist teavet käesolerva <application>Mageia</application> väljalaske kohta
-näeb, kui klõpsata nupule <guibutton>Väljalaskemärkmed</guibutton>.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/addUser.xml b/docs/docs/stable/installer/et/addUser.xml
index 87f8f2fe..fbb246cc 100644
--- a/docs/docs/stable/installer/et/addUser.xml
+++ b/docs/docs/stable/installer/et/addUser.xml
@@ -1,36 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Kasutajate ja administraatori haldamine</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Administraatori (root) parooli määramine</title>
     </info>
 
-    <para>Kõigi <application>Mageia</application> paigalduste korral on soovitatav
-määrata administraatori (Linuxis kasutatakse selle kohta tavaliselt
-väljendit <emphasis role="bold">superuser</emphasis> või
-<emphasis>root</emphasis>) parool. Parooli ülemisse kasti kirjutades muutub
-kilbi värv punasest kollaseks ja roheliseks vastavalt sellele, kui tugevaks
-parooli hinnatakse. Roheline kilp tähendab, et parool on tugev ja
-kindel. Sama parool tuleb kirjutada teist korda kohe allpool olevasse kasti:
-sellega kontrollitakse, et parool sai esimesse kasti õigesti kirjutatud,
-neid kahte omavahel võrreldes.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>Kõik paroolid on tõstutundlikud, see tähendab arvestavad väike- ja
-suurtähti. Parooli tugevuse huvides on mõistlik kasutada tähtede (nii suur-
-kui ka väiketähtede) kõrval ka numbreid ja muid märke.</para>
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
 
@@ -39,44 +55,46 @@ kui ka väiketähtede) kõrval ka numbreid ja muid märke.</para>
       <title xml:id="enterUser-ti3">Kasutaja lisamine</title>
     </info>
 
-    <para>Siin saab lisada kasutaja. Kasutajal on vähem õigusi kui administraatoril
-(<emphasis role="bold">root</emphasis>), kuid siiski piisavalt internetis
-liikumiseks, kontoritöörakenduste kasutamiseks, mängimiseks ja kõigeks
-muuks, mida tavaline kasutaja oma arvutis teeb</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Ikoon</guibutton>: sellele nupule klõpsates saab muuta kasutaja
-ikooni.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Pärisnimi</guilabel>: siin saab kirja panna kasutaja tegeliku
-nime.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Kasutajatunnus</guilabel>: siin saab kirja panna kasutajanime või
-lasta DrakXil pakkuda pärisnimest tuletatud variandi. <emphasis
-role="bold">Kasutajatunnus on tõstutundlik.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Parool</guilabel>: siin saab kirja panna kasutaja
-parooli. Tekstikasti lõpus on kilp, mis näitab parooli tugevust (vt ka <xref
-linkend="givePassword"/>).</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Parool (uuesti)</guilabel>: siia tuleb parool teist korda
-kirjutada, mille järel Drakx kontrollib, kas see ikka sobib kokku sellega,
-mille sisestasid esimesel korral.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Kõigi Mageia paigaldamise ajal lisatud kasutajate kodukataloog on nii
-lugemis- kui ka kirjutuskaitstud (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>Kõik vajalikud kasutajad saab lisada juba paigaldamise ajal
 <emphasis>kokkuvõtte</emphasis> etapil. Valige seal <emphasis>Kasutajate
@@ -86,33 +104,31 @@ haldamine</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Põhjalikum kasutajate haldamine</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>Nupule <guibutton>Muud valikud</guibutton> klõpsates ilmub ekraan, kus saab
-muuta lisatava kasutaja mõningaid seadistusi.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: selles rippmenüüs saab muuta shelli, mida
-kasutab eelmisel ekraanil lisatud kasutaja. Valikuteks on <emphasis
-role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis> ja
-<emphasis role="bold">Sh</emphasis>.</para>
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Kasutaja ID</guilabel>: siin saab määrata eelmisel ekraanil
-lisatud <emphasis role="bold">kasutaja ID</emphasis>. See on arv. Kui te ei
-tea, milleks see hea on, ärge siia midagi kirjutage.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Grupi ID</guilabel>: siin saab määrata <emphasis role="bold">grupi
-ID</emphasis>. Kui te ei tea, milleks see hea on, ärge ka siia midagi
-kirjutage.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/et/add_supplemental_media.xml b/docs/docs/stable/installer/et/add_supplemental_media.xml
index 8335c59c..edfa1598 100644
--- a/docs/docs/stable/installer/et/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/et/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="et">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Andmekandjate valik (täiendavate paigaldusandmekandjate seadistamine)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,44 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>Siin on näha juba tuvastatud tarkvarahoidlad. Võite lisada ka teisi
-allikaid, kust tarkvarapakette hankida, näiteks plaadi pealt või
-internetist. Allikate valik määrab, milliseid tarkvarapakette saab
-järgmistel etappidel kasutada.</para>
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Võrguallika korral tuleb lisaks ette võtta järgmised sammud:</para>
 
   <orderedlist>
     <listitem>
-      <para>Valida ja aktiveerida võrk, kui see veel ei tööta.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
-      <para>Valida peegel või määrata URL (esimene kirje). Peegli valimisel saab
-kasutada kõiki Mageia määratud hoidlaid, sealhulgas mittevaba (<emphasis
-role="bold">nonfree</emphasis>) ja piirangutega (<emphasis
-role="bold">tainted</emphasis>) tarkvara ja uuendusi (<emphasis
-role="bold">updates</emphasis>) sisaldavaid hoidlaid. URL-i määrates saab
-kasutada mõnda konkreetset hoidlat või omaenda NFS-allikat.</para>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>Kui uuendate 64-bitist paigaldust, milles võib leiduda mõningaid 32-bitiseid
-rakendusi, on soovitatav sellel ekraanil lisada võrgupeegel, märkides
-selleks ära mõni pakutud võrguprotokoll. 64-bitise DVD ISO-tõmmis sisaldab
-ainult 64-bitiseid ja arhitektuurist sõltumatuid tarkvarapakette, mistõttu
-selle abil ei saa uuendada 32-bitiseid rakendusi. Kuid pärast võrgupeegli
-lisamist leiab paigaldusprogramm ise sealt üles vajalikud 32-bitised
-tarkvarapaketid.</para>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/ask_mntpoint_s.xml b/docs/docs/stable/installer/et/ask_mntpoint_s.xml
index 79e9ed3c..69e7b9d3 100644
--- a/docs/docs/stable/installer/et/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/et/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Haakepunktide valimine</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Siin näeb Linuxi partitsioone, mis arvutist leiti. Kui te pole
-<application>DrakX</application>i ettepanekutega nõus, võite haakepunkte
-muuta.</para>
-
-  <note>
-    <para>Kui te ka midagi muudate, kontrollige alati, et teil jääks alles
-juurpartitsioon (<emphasis role="bold"><literal>/)</literal></emphasis>.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Kõiki partitsioone näidatakse kujul <emphasis role="bold">"Seade" ("Suurus",
-"Haakepunkt", "Tüüp")</emphasis>.</para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Seade</emphasis> koosneb järgmistest
-elementidest:<emphasis role="bold">kõvaketas</emphasis>, [<emphasis
-role="bold">kõvaketta nimi</emphasis> (täht)], <emphasis
-role="bold">partitsiooni number</emphasis> (näiteks <emphasis
-role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>Kui partitsioone on palju, saab neile haakepunkte valida rippmenüüst
-(näiteks <emphasis role="bold">/</emphasis>, <emphasis
-role="bold"><literal>/home</literal></emphasis> ja <emphasis
-role="bold">/var</emphasis>). Võib ka luua oma haakepunkte, näiteks
-<emphasis role="bold"><literal>/video</literal></emphasis> partitsioonile,
-kuhu soovite salvestada filme, või <emphasis role="bold">Andmed</emphasis>.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -79,13 +82,17 @@ jätta.</para>
   </itemizedlist>
 
   <warning>
-    <para>Kui te pole kindel, mida valida, klõpsake <emphasis
-role="bold">Tagasi</emphasis> ning märkige <guilabel>Ketta jagamine oma
-tahtmist mööda</guilabel>. Ilmuval ekraanil saab partitsioonile klõpsates
-näha selle tüüpi ja suurust.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Kui olete kindel, et haakepunktid on paigas, klõpsake
-<guibutton>Edasi</guibutton> ja valige, kas soovite vormindada ainult
-partitsioonid, mida DrakX soovitab, või rohkem.</para>
-</section>
\ No newline at end of file
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/et/bestTime.xml b/docs/docs/stable/installer/et/bestTime.xml
index 0a43b2f0..102d1e5f 100644
--- a/docs/docs/stable/installer/et/bestTime.xml
+++ b/docs/docs/stable/installer/et/bestTime.xml
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="et" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="et" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Kellaaja seadistamine</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>Siin tuleb valida, kas arvuti sisemine kell on seatud kohalikule ajale või
-UTC ehk standardajale.</para>
-
-  <para>Muude valikute kaadril leiab rohkem võimalusi kellaaega täpsemalt
-seadistada.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/bootLive.xml b/docs/docs/stable/installer/et/bootLive.xml
index ce9ec21b..2368b8ee 100644
--- a/docs/docs/stable/installer/et/bootLive.xml
+++ b/docs/docs/stable/installer/et/bootLive.xml
@@ -1,27 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="et"><info><title xml:id="bootLive-ti1">Mageia laadimine Live-süsteemina</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Käivitamine andmekandjalt</title></info><section><info><title xml:id="bootLive11-ti1">Kettalt</title></info><para>Algkäivituse võib teha otse andmekandjalt, millele olete kirjutanud oma
-tõmmise (CD-ROM, DVD-ROM vms). Tavaliselt tuleb andmekandja lihtsalt asetada
-CD/DVD-seadmesse ning alglaadur käivitab arvuti taaskäivitamise järel
-paigaldamise automaatselt. Kui seda ei juhtu, võib olla vajalik BIOS ümber
-seadistada või vajutada vastavat klahvi, mis võimaldab valida lisaseadme,
-millest arvuti käivitada.</para><para>Sõltuvalt teie riistvarast ja selle kehtivast seadistusest näete üht kahest
-alltoodud ekraanist.</para></section><section><info><title xml:id="bootLive12-ti1">USB-pulgalt</title></info><para>Algkäivituse saab teha USB-pulgalt, millele kirjutasite
-ISO-tõmmise. Sõltuvalt BIOS-e seadistusest võib arvuti otse käivituda
-USB-pulgalt, mis on masinaga ühendatud. Kui seda ei juhtu, võib olla vajalik
-BIOS ümber seadistada või vajutada vastavat klahvi, mis võimaldab valida
-lisaseadme, millest arvuti käivitada. </para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">BIOS-e/CSM-i/Pärandrežiimis</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Esimene ekraan BIOS-e režiimis algkäivitusel</para></caption></mediaobject><para>Keskel asuvas menüüs saab valida kolme võimaluse vahel:</para><itemizedlist><listitem><para>Mageia laadimine: see tähendab, et Mageia 5 käivitatakse ühendatud
-andmekandjalt (CD/DVD või USB-pulk) ilma midagi kettale kirjutamata, mis
-ühtlasi tähendab, et kõik võib olla väga aeglane. Kui käivitamine on läbi,
-võite ka süsteemi kõvakettale paigaldada.</para></listitem><listitem><para>Mageia paigaldamine: sel juhul paigaldatakse Mageia kohe kõvakettale.</para></listitem><listitem><para>Alglaadimine kõvakettalt: sel juhul käivitatakse süsteem kõvakettal, nagu
-seda tehakse ka siis, kui andmekandjat (CD/DVD või USB-pulk) pole masinaga
-ühendatud (Mageia 5 puhul see ei toimi).</para></listitem></itemizedlist><para>Allservas asuvas menüüs leiab alglaadimisvalikud:</para><itemizedlist><listitem><para>F1 - Abi. Selgitab valikuid "splash", "apm", "acpi" ja "Ide".</para></listitem><listitem><para>F2 - keel. Ekraanil nähtava keele valimine.</para></listitem><listitem><para>F3 - ekraanilahutus. Valida on tekst, 640x400, 800x600, 1024x728.</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom või Muu. Tavaliselt sooritatakse paigaldamine ühendatud
-paigaldusandmekandjalt. Siin saab valida ka muu allika, näiteks FTP- või
-NFS-serveri. Kui paigaldus sooritatakse SLP-serveriga võrgus, tuleb selle
-korral valida serveril saada olev paigaldusandmekandja.</para></listitem><listitem><para>F6 - draiver. Jah või Ei. Süsteem on teadlik draiveriuuendusega lisaketta
-olemasolust ning nõuab selle paigaldamise käigus selle ühendamist.</para></listitem><listitem><para>F6 - kerneli võtmed. Siin saab määrata konkreetseid võtmeid, mida vajavad
-teie riistvara ja kasutatavad draiverid.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">UEFI režiimis</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Esimene ekraan UEFI süsteemi käivitamisel kettalt</para></caption></mediaobject><para>Siin on ainult kaks valikut: Mageia käivitamine live-režiimis (esimene
-valik) või paigaldamine (teine valik).</para><para>Kui olete süsteemi laadinud USB-pulgalt, näeb veel kaht rida, mis on muidu
-samasugused nagu kaks esimest, ainult et lisatud on "USB". Siis tuleb valida
-üks neist.</para><para>Kõigil juhtudel on esimesteks sammudeks ühtmoodi keele, ajavööndi ja
-klaviatuuri valimine, seejärel aga lähevad asjad lahku <link
-linkend="testing">Live-režiimi lisasammude</link> tõttu.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Mageia laadimine Live-süsteemina</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Käivitamine andmekandjalt</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">BIOS-e/CSM-i/Pärandrežiimis</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Esimene ekraan BIOS-e režiimis algkäivitusel</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">UEFI režiimis</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/et/chooseDesktop.xml b/docs/docs/stable/installer/et/chooseDesktop.xml
index c68212d4..b4aebbba 100644
--- a/docs/docs/stable/installer/et/chooseDesktop.xml
+++ b/docs/docs/stable/installer/et/chooseDesktop.xml
@@ -1,27 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Töölaua valimine</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Töölaua valimine</title>
   </info>
 
   
 
-  <para>Sõltuvalt siin langetatud valikutest võite näha täiendavaid ekraane, kus
-saab valikut täpsustada.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>Pärast valiku(te) langetamist näeb pakettide paigaldamise ajal
-slaidiseanssi. Sellest saab loobuda, kui klõpsata nupule
-<guilabel>Üksikasjad</guilabel>.</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Siin saab valida, kas soovite kasutada <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> või <application>Gnome</application>
-töökeskkonda. Mõlemad pakuvad rakendusi ja tööriistu igale maitsele.  Valige
-<guilabel>Kohandatud</guilabel>, kui teile ei meeldi kumbki või kui soovite
-paigaldada midagi muud kui seda, mis paigaldatakse vaikimisi.
-<application>LXDE</application> töölaud on näiteks väiksem kui eelmainitud,
-pakkudes vähem tilu-lilu ja ka vähemat arvu pakette.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/et/choosePackageGroups.xml b/docs/docs/stable/installer/et/choosePackageGroups.xml
index 78126c5d..50b1e89d 100644
--- a/docs/docs/stable/installer/et/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/et/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Paketigruppide valimine</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/et/choosePackagesTree.xml b/docs/docs/stable/installer/et/choosePackagesTree.xml
index 1092f285..54fae7c0 100644
--- a/docs/docs/stable/installer/et/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/et/choosePackagesTree.xml
@@ -1,20 +1,26 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="et">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="et">
   <info>
     <title xml:id="choosePackagesTree-ti1">Üksikpakettide valimine</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Siin saab oma paigaldust kohandada, lisades või eemaldades tarkvarapakette.</para>
 
-  <para>Kui olete vajalikud valikud langetanud, võite klõpsata lehekülje allosas
-<guibutton>disketiikoonile</guibutton>, mis lubab salvestada paketivaliku
-(seda saab mõistagi salvestada ka USB-pulgale). Hiljem võib sama faili
-kasutades paigaldada samasuguse paketivaliku mõnda teise süsteemi, klõpsates
-paigaldamise ajal sama nuppu ja faili laadides.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/configureServices.xml b/docs/docs/stable/installer/et/configureServices.xml
index fc26630c..45fbecfe 100644
--- a/docs/docs/stable/installer/et/configureServices.xml
+++ b/docs/docs/stable/installer/et/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="et" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Teenuste seadistamine</title>
   </info>
@@ -7,21 +7,32 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Siin saab määrata, millised teenused käivitada või mitte käivitada koos
 süsteemi alglaadimisega.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Kolmnurgal klõpsates saab avada kõiki vastavaid teenusi sisaldava grupi.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">Valikud, mille on langetanud DrakX, on tavaliselt mõistlikud ja head.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">Teenuse peale klõpsates näeb allpool teabekastis mõningat teavet teenuse
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Teenuse peale klõpsates näeb allpool teabekastis mõningat teavet teenuse
 kohta.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Muutke siin midagi ainult siis, kui olete kindel, et teate, mida teete.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/configureTimezoneUTC.xml b/docs/docs/stable/installer/et/configureTimezoneUTC.xml
index 63781310..1b51e5f6 100644
--- a/docs/docs/stable/installer/et/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/et/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="et">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="et">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Ajavööndi seadistamine</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Määrake ajavöönd kindlaks, valides oma riigi või linna, mis asub samas
-ajavööndis teie lähedal.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">Järgmisel ekraanil saab valida, kas riistvaraline kell on seatud kohalikule
 ajale või GMT-le ehk maailmaajale (UTC).</para>
diff --git a/docs/docs/stable/installer/et/configureX_card_list.xml b/docs/docs/stable/installer/et/configureX_card_list.xml
index 265de3af..17f32719 100644
--- a/docs/docs/stable/installer/et/configureX_card_list.xml
+++ b/docs/docs/stable/installer/et/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">X-serveri valimine (graafikakaardi seadistamine)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX sisaldab väga põhjalikku videokaartide andmebaasi ja suudab tavaliselt
 teie videoseadme korrektselt tuvastada.</para>
@@ -30,33 +43,34 @@ teie videoseadme korrektselt tuvastada.</para>
 te teate, milline kaart teil on, võite valida selle loetelust järgmiste
 parameetrite alusel: <itemizedlist>
       <listitem>
-        <para>tootja</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>seejärel kaardi nimi</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>ja lõpuks kaardi tüüp</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
-  <para>Kui te ei leia oma kaarti tootjate nimekirjast (sest seda pole veel
-andmebaasis või on tegu väga vana kaardiga), võib siiski leida sobiva
-draiveri Xorg-i kategoorias. <emphasis role="bold">Xorg</emphasis>-i
-nimekiri pakub üle 40 üldise avatud lähtekoodiga videokaardi draiveri. Kui
-te ikkagi ei suuda oma kaardile sobivat draiverit siit leida, võite valida
-<emphasis role="bold">Vesa</emphasis> draiveri, mis pakub kõige
-elementaarsemaid võimalusi.</para>
-
-  <para>Arvestage kindlasti, et kui valite sobimatu draiveri, võite saada kasutada
-ainult <emphasis role="bold">käsurida</emphasis>.</para>
+  <para>If you cannot find your card in the vendor lists (because it's not yet in
+the database or it's an older card) you may find a suitable driver in the
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Mõned videokaartide tootjad pakuvad Linuxile omanduslikke draivereid, mis
-võivad olla saadaval ainult <emphasis role="bold">Nonfree</emphasis>
-tarkvarahoidlas, mõnel juhul isegi kõigest tootja enda veebileheküljel.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
-  <para><emphasis role="bold">Nonfree</emphasis> hoidlad tuleb kasutamiseks
-spetsiaalselt lubada.  Seda saab teha pärast arvuti esimest taaskäivitamist.</para>
-</section>
\ No newline at end of file
+  <para>Some video card manufacturers provide proprietary drivers for Linux which
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/et/configureX_chooser.xml b/docs/docs/stable/installer/et/configureX_chooser.xml
index 9afd74b5..3f9c36f5 100644
--- a/docs/docs/stable/installer/et/configureX_chooser.xml
+++ b/docs/docs/stable/installer/et/configureX_chooser.xml
@@ -1,64 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Graafikakaardi ja monitori seadistamine</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
-
-  <para revision="1" xml:id="configureX_chooser-pa1">Sõltumata sellest, millise graafilise keskkonna ehk töökeskkonna olete
-otsustanud oma <application>Mageia</application> paigaldusele valida,
-kasutavad nad kõik graafilise kasutajaliidese süsteemi <acronym>X Window
-System</acronym>, lihtsamalt öeldes <acronym>X</acronym>. Niisiis peavad
-selleks, et <acronym>KDE</acronym>, <acronym>Gnome</acronym>,
-<acronym>LXDE</acronym> või mis tahes töökeskkond korralikult töötaks, olema
-järgmised <acronym>X</acronym>'i seadistused korras. Valige õiged
-seadistused, kui näete, et DrakX ei ole midagi valinud, või kui arvate, et
-valik ei ole õige.</para>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
+
+  <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Graafikakaart</guibutton></emphasis>: valige vajaduse
-korral loetelust oma kaart.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: valida saab
-<guilabel>Plug'n Play</guilabel>, kui see sobib, või siis vajaliku monitori
-nimekirjast pealdise <guilabel>Tootja</guilabel> või
-<guilabel>Tavaline</guilabel> all. Valige <guilabel>Kohandatud</guilabel>,
-kui eelistate käsitsi paika panna oma monitori realaotus- ja
-ekraaniuuendussageduse.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Väärad sagedused võivad monitori kahjustada.</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Ekraanilahutus</guibutton></emphasis>: siin saab
-määrata vajaliku monitori ekraanilahutuse ja värvisügavuse.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: testimisnuppu paigaldamise
-ajal alati ei näe. Kui see on näha, siis saab sellele vajutades kontrollida
-määratud seadistuste õigsust. Kui näete küsimust, kas seadistused on õiged,
-võite vastata <emphasis role="bold">jah</emphasis> ning seadistused
-salvestatakse. Kui te ei näe midagi, saate tagasi pöörduda
-seadistusekraanile ja seal seni parameetreid muuta, kuni test annab vajaliku
-tulemuse. Kui testimisnuppu pole, kontrollige eriti hoolikalt, et kõik
-seadistused oleksid korras.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Eelistused</guibutton></emphasis>: siin saab
-mitmesuguseid valikuid lubada või keelata.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/et/configureX_monitor.xml b/docs/docs/stable/installer/et/configureX_monitor.xml
index 6222a4e3..72cc034b 100644
--- a/docs/docs/stable/installer/et/configureX_monitor.xml
+++ b/docs/docs/stable/installer/et/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,63 +23,83 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Monitori valimine</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX sisaldab väga põhjalikku monitoride andmebaasi ja tuvastab tavaliselt
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX sisaldab väga põhjalikku monitoride andmebaasi ja tuvastab tavaliselt
 teie monitori õigesti.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Teistsuguste parameetritega monitori valimine võib
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Teistsuguste parameetritega monitori valimine võib
 kahjustada monitori või videoriistvara. Palun ärge proovige lihtsalt huvi
 pärast midagi, kui te ei ole kindel, et teate täpselt, mida
 teete.</emphasis> Kahtluste korral uurige oma monitori dokumentatsiooni.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Kohandatud</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Selle valimine võimaldab paika panna kaks äärmiselt tähtsat parameetrit:
-realaotussageduse ja ekraaniuuendussageduse.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">On <emphasis>VÄGA TÄHTIS</emphasis>, et te ei valiks sellise
+        <para revision="1" xml:id="configureX_monitor-pa4">On <emphasis>VÄGA TÄHTIS</emphasis>, et te ei valiks sellise
 sünkroonimissagedusega monitori tüüpi, mis ületab teie monitori võimeid: sel
 moel võib monitorile tõsist kahju teha. Kui kahtlete, valige pigem
 tagasihoidlikum väärtus ja kindlasti uurige monitori dokumentatsiooni.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug'n Play</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">See on vaikimisi valik, mis üritab määrata monitori tüübi monitoride
-andmebaasi põhjal.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Tootja</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">Kui paigaldusprogramm ei ole teie videokaarti õigesti tuvastanud ja te
-teate, milline kaart teil on, võite valida selle puust järgmiste
-parameetrite alusel: <itemizedlist>
       <listitem>
-        <para>tootja</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>monitori nimi</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>monitori kirjeldus</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Kui paigaldusprogramm ei ole teie videokaarti õigesti tuvastanud ja te
+teate, milline kaart teil on, võite valida selle puust järgmiste
+parameetrite alusel:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Tavaline</emphasis></para>
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">Selles grupis on valida ligemale 30 seadistuse seast, näiteks 1024x768 @
-60Hz, sealhulgas lamekuvarid, mida kasutavad eriti sülearvutid. See on
-sageli mõistlik monitori valimise grupp, kui teie videoriistvara ei suudetud
-automaatselt tuvastada ja peate kasutama <emphasis
-role="bold">Vesa</emphasis> draiverit. Ka siin tasub valides olla pigem
-konservatiivne.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
+
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/et/diskPartitioning.xml b/docs/docs/stable/installer/et/diskPartitioning.xml
new file mode 100644
index 00000000..08258016
--- /dev/null
+++ b/docs/docs/stable/installer/et/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="et" version="5.0" xml:lang="et">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/diskdrake.xml b/docs/docs/stable/installer/et/diskdrake.xml
index 02fd7269..b33724ca 100644
--- a/docs/docs/stable/installer/et/diskdrake.xml
+++ b/docs/docs/stable/installer/et/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Ketta kohandatud partitsioneerimine DiskDrake'i abil</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">Kui soovite krüptida oma <emphasis role="bold">/</emphasis> partitsiooni,
-peab teil kindlasti olema ka eraldi <emphasis
-role="bold">/boot</emphasis>partitsioon. <emphasis
-role="bold">/boot</emphasis> partitsioonile EI TOHI määrata
-krüptimisvalikut, sest siis ei ole süsteemi võimalik üldse laadida.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Siin saab kohandada ketta või ketaste jagamist: eemaldada või luua
-partitsioone, muuta partitsiooni failisüsteemi või suurust ning isegi enne
-alustamist näha, mida partitsioon sisaldab.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">Igale leitud kõvakettale või muule salvestusseadmele (näiteks USB-pulgale)
-on omaette kaart. Siinsel pildil on näha kaks seadet: <emphasis
-role="bold">sda</emphasis> ja <emphasis role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa5" revision="1">Kõigi valitud salvestusseadme partitsioonide kustutamiseks valige
-<guibutton>Kustuta kõik</guibutton>.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6" revision="1">Kõigi teiste toimingute jaoks klõpsake kõigepealt vajalikul
-partitsioonil. Siis saate seda uurida, valida failisüsteemi või haakepunkti,
-suurust muuta või ka kustutada. <guibutton>Ekspertrežiim</guibutton> pakub
-rohkem võimalusi, näiteks nime lisamine või partitsiooni tüübi valimine.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Jätkake, kuni kõik on nii, nagu soovite.</para>
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Kui kõik on valmis, klõpsake nupule <guibutton>Tehtud</guibutton>.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>Kui paigaldate Mageia UEFI süsteemi, kontrollige, kas ESP (EFI süsteemne
-partitsioon) on ikka olemas ja korrektselt haagitud asukohta /boot/EFI (vt
-tagapool).</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>Kui paigaldate Mageia pärand/GPT süsteemi, kontrollige, kas korrektse
-tüübiga BIOS-e alglaadimispartitsioon on ikka olemas.</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/et/doPartitionDisks.xml b/docs/docs/stable/installer/et/doPartitionDisks.xml
index 3f5d7dba..799f711e 100644
--- a/docs/docs/stable/installer/et/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/et/doPartitionDisks.xml
@@ -1,174 +1,214 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Partitsioneerimine</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">Sellel ekraanil näete oma kõvaketta või -ketaste sisu ning lahendusi, mida
-DrakXi partitsioneerimisnõustaja pakub <application>Mageia</application>
-paigaldamiseks.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">Pakutavad valikud sõltuvad teie kõvaketaste konkreetsest ülesehitusest ja
-sisust.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Olemasolevate partitsioonide kasutamine</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">Kui see on näha, leiti olemasolevad Linuxiga ühilduvad partitsioonid ning
+      <para revision="1" xml:id="doPartitionDisks-pa5">Kui see on näha, leiti olemasolevad Linuxiga ühilduvad partitsioonid ning
 neid võib kasutada paigaldamiseks.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Vaba ruumi kasutamine</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">Kui kõvakettal on kasutamata ruumi, siis selle valikuga saab selle eraldada
+      <para revision="1" xml:id="doPartitionDisks-pa7">Kui kõvakettal on kasutamata ruumi, siis selle valikuga saab selle eraldada
 uuele Mageia paigaldusele.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Vaba ruumi kasutamine Windowsi partitsioonil</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">Kui olemasoleval Windowsi partitsioonil on vaba ruumi, võib
-paigaldusprogramm seda kasutada.</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">See võib olla väga mõistlik valik oma uuele Mageia paigaldusele ruumi
-leidmiseks, kuid samal ajal on see riskantne, mistõttu tuleks kindlasti teha
-kõigist olulistest failidest varukoopia!</para>
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
 
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Pange tähele, et sellega kaasneb Windowsi partitsiooni suuruse
 vähendamine. Partitsioon peab olema "puhas", see tähendab Windows peab olema
 viimasel korral korrektselt suletud. Samuti peab partitsioon olema
 defragmenteeritud, ehkki see ei garanteeri veel, et kõik failid on alalt,
 mida Mageia paigaldamiseks kasutatakse, tõepoolest eemaldatud. Sellepärast
 ongi äärmiselt soovitatav kõik vähegi olulised failid eelnevalt varundada.</para>
+      </important>
+    </listitem>
 
-        <para>Selle valiku korral näitab paigaldusprogramm alles jäävat Windowsi
-partitsiooni helesinisena ja tulevast Mageia partitsiooni tumesinisena ning
-nende all näeb kavandatud suurusi. Ühtlasi on teil võimalus neid suurusi
-muuta, klõpsates partitsioonide vahel asuvale tühialale ja seda
-lohistades. Seda näitab allolev pilt.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Kogu ketta tühjendamine ja kasutamine</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">Selle valimisel kasutatakse kogu ketast ainult Mageia jaoks.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Tähelepanu! Sellega kustutatakse valitud kõvakettalt KÕIK andmed. Olge
-ettevaatlik!</para>
-
-        <para xml:id="doPartitionDisks-pa15" revision="1">Kui kavatsete kasutada osa kettast millegi muu tarbeks või on teil juba
-kettal andmeid, mida te ei soovi kaotada, ärge seda võimalust valige.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Ketta jagamine oma tahtmist mööda</para>
-
-        <para xml:id="doPartitionDisks-pa17" revision="1">See valik annab täieliku kontrolli määrata, kuidas ja kuhu Mageia kõvakettal
+      <para revision="1" xml:id="doPartitionDisks-pa17">See valik annab täieliku kontrolli määrata, kuidas ja kuhu Mageia kõvakettal
 või -ketastel paigaldatakse.</para>
-      </listitem>
-    </itemizedlist></para>
-
-  <para><emphasis role="bold">Partitsiooni suurus:</emphasis></para>
-
-  <para>Kui te ei vali võimalust <emphasis role="bold">Ketta jagamine oma tahtmist
-mööda</emphasis>, siis jagab paigaldusprogramm saadaoleva ruumi ära
-järgmiste reeglite kohaselt:</para>
-
-  <para><itemizedlist>
-      <listitem>
-        <para>Kui kokku on saadaval alla 50 GB, luuakse ainult üks partitsioon<emphasis
-role="bold"> /</emphasis> jaoks ning /home jaoks eraldi partitsiooni ei
-looda.</para>
-      </listitem>
-
-      <listitem>
-        <para>Kui kokku on saadaval üle 50 GB, luuakse kolm partitsiooni</para>
-
-        <itemizedlist>
-          <listitem>
-            <para>6/19 saadaolevast koguruumist eraldatakse <emphasis role="bold">/</emphasis>
-jaoks maksimaalse suurusega 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 eraldatakse saalealaks maksimaalse suurusega 4 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>ülejäänu (vähemalt 12/19) eraldatakse <emphasis role="bold">/home</emphasis>
-jaoks</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    </listitem>
+  </itemizedlist>
 
-  <para>See tähendab, et kui ruumi on 160 GB või rohkem, loob paigaldusprogramm kolm
-partitsiooni: 50 GB <emphasis role="bold">/</emphasis> jaoks, 4 GB <emphasis
-role="bold">saaleala</emphasis> jaoks ja ülejäänu <emphasis
-role="bold">/home</emphasis> jaoks.</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>Kui kokku on saadaval üle 50 GB, luuakse kolm partitsiooni</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para>Kui kasutate UEFI süsteemi, tuvastatakse automaatselt ESP (EFI süsteemne
-partitsioon) või see luuakse, kui seda pole, ja haagitakse asukohas
-/boot/EFI. Valik <emphasis role="bold">Ketta jagamine oma tahtmist
-mööda</emphasis> on ainuke, mis lubab kontrollida, kas seda on õigesti
-tehtud.</para>
+    <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>Kui kasutate pärandsüsteemi (tuntud ka kui CSM või BIOS) GPT-kettaga, tuleb
-luua BIOS-e alglaadimispartitsioon, kui seda veel ei ole. See on umbes 1 MiB
-suurune partitsioon ilma haakepunktita. Selle loomiseks valige "<xref
-linkend="diskdrake"/>" ja looge see nagu iga teine partitsioon, ainult et
-valige failisüsteemiks BIOS boot partition.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+
+  <important>
+    <para>Some newer drives are now using 4096 byte logical sectors, instead of the
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
 
-  <warning>
-    <para>Mõned uuemad kettad kasutavad nüüd 4096-baidiseid loogilisi sektoreid
-varasema standardi, 512-baidiste sektorite asemel. Sobiva riistvara
-puudumise tõttu ei ole paigaldusprogrammis kasutatavat
-partitsioneerimistööriista niisuguste ketastega testitud. Samuti on mõnes
-SSD-seadmes nüüdseks kasutusel kustutusblokk suurusega üle 1 MB. Seepärast
-soovitame juhul, kui Teil peaks olema niisugune seade, selle eelnevalt
-partitsioneerida, kasutades mõnda muud partitsioneerimistööriista, näiteks
-<emphasis role="bold">gparted</emphasis>.</para>
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Samuti kontrollige, et kõigi loodud partitsioonide suurus megabaitides oleks
 paarisarv.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/et/exitInstall.xml b/docs/docs/stable/installer/et/exitInstall.xml
index 91520b81..1e68c389 100644
--- a/docs/docs/stable/installer/et/exitInstall.xml
+++ b/docs/docs/stable/installer/et/exitInstall.xml
@@ -5,23 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">Olete lõpetanud <application>Mageia</application> paigaldamise ja
-seadistamise ning nüüd on turvaline eemaldada paigaldusandmekandja ja arvuti
-taaskäivitada.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">Pärast taaskäivitamist saab alglaaduri ekraanil valida käivitatava
-operatsioonisüsteemi, kui teil peaks neid arvutis üle ühe olema.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">Kui te ei kohandanud alglaaduri seadistusi, valitakse ja käivitatakse
 automaatselt teie uus Mageia.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Tundke rõõmu ja nautige!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Külastage veebilehte www.mageia.org, kui teil on küsimusi või kui soovite
-anda oma panuse Mageia edusse.</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/firewall.xml b/docs/docs/stable/installer/et/firewall.xml
index ce68766d..cb9bb13c 100644
--- a/docs/docs/stable/installer/et/firewall.xml
+++ b/docs/docs/stable/installer/et/firewall.xml
@@ -1,30 +1,36 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="et">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="et" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Tulemüür</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Tulemüür</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">Siin saab paika panna mõned lihtsad tulemüüri reeglid, mis määravad kndlaks,
 millist laadi teavet internetist sihtsüsteem vastu võtab. See omakorda
 võimaldab süsteemi vastavatele teenustele ligi pääseda ka internetist.</para>
 
-  <para>Vaikimisi ei ole ükski nupp märgitud, mis tähendab, et võrgust ei ole
-kättesaadav ükski süsteemi teenus. Nupul <emphasis role="bold">Kõik
-(tulemüür puudub)</emphasis> on eriline tähendus: see võimaldab ligipääsu
-masina kõigile teenustele. Paigaldamise ajal ei ole seda küll väga mõtet
-valida, sest nii on tulemuseks täiesti kaitsmata süsteem. Seda võimalust on
-mõnikord mõistlik valida juba töötavas süsteemis Mageia juhtimiskeskuses
-(kus kasutatakse graafiliselt samasugust liidest) kõigi tulemüüri reeglite
-ajutiseks tühistamiseks näiteks testimise või silumise eesmärgil.</para>
+  <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
 
-  <para>Kõigi muude märkekastide juures olev tekst peaks enda eest rääkima. Näiteks
-on mõtet märkida <emphasis role="bold">CUPS-i server</emphasis>, kui
-soovite, et masinaga ühendatud printerid oleksid kättesaadavad ka võrgust.</para>
+  <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Muud valikud</emphasis></para>
 
-  <para>Nupule <emphasis role="bold">Muud valikud</emphasis> klõpsates avaneb aken,
-kus saab lubada terve rea teenuseid, kui kirjutada need tühikutega
-eraldatult järgmiselt</para>
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
 
   <para><emphasis>&lt;pordi-number>/&lt;protokoll></emphasis></para>
 
diff --git a/docs/docs/stable/installer/et/formatPartitions.xml b/docs/docs/stable/installer/et/formatPartitions.xml
index 6a8e383f..9fe4f6a0 100644
--- a/docs/docs/stable/installer/et/formatPartitions.xml
+++ b/docs/docs/stable/installer/et/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Vormindamine</title>
   </info>
@@ -11,33 +18,37 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Siin saab valida, millised partitsioonid vormindada. Kõik andmed
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Siin saab valida, millised partitsioonid vormindada. Kõik andmed
 partitsioonidel, mis <emphasis>ei ole</emphasis> vormindamiseks märgitud,
 säilivad.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Üldjuhul on vaja vormindada vähemalt partitsioonid, mille DrakX on valinud.</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Kui klõpsata <guibutton>Muud valikud</guibutton>, saab valida partitsioonid,
-millel kontrollitakse niinimetatud <emphasis>riknenud plokke.</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">Kui te pole kindel, et olete langetanud õige valiku, klõpsake
-<guibutton>Tagasi</guibutton>, veel kord <guibutton>Tagasi</guibutton> ja
-siis <guibutton>Kohandatud</guibutton>, et jõuda tagasi peaekraanile. Seal
-saate uurida, mis partitsioonidel leidub.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">Kui olete oma valikus kindel, klõpsake jätkamiseks
-<guibutton>Edasi</guibutton>.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/et/graphicalConfiguration.xml b/docs/docs/stable/installer/et/graphicalConfiguration.xml
new file mode 100644
index 00000000..438275c0
--- /dev/null
+++ b/docs/docs/stable/installer/et/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/et/installUpdates.xml b/docs/docs/stable/installer/et/installUpdates.xml
index 3c67f569..f8a3c26d 100644
--- a/docs/docs/stable/installer/et/installUpdates.xml
+++ b/docs/docs/stable/installer/et/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="et">
-  <info>
-    <title xml:id="installUpdates-ti1">Uuendused</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Uuendused</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Võimalik, et pärast <application>Mageia</application> väljalaske ilmumist on
-mõningaid pakette uuendatud või parandatud.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Valige <guilabel>Jah</guilabel>, kui soovite sellised paketid alla laadida
-ja paigaldada, või <guilabel>Ei</guilabel>, kui te seda praegu ei soovi või
-kui teil puudub parajasti internetiühendus.</para>
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Seejärel klõpsake jätkamiseks <guibutton>Edasi</guibutton>.</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/installer.xml b/docs/docs/stable/installer/et/installer.xml
index 1da5ac64..35c9610b 100644
--- a/docs/docs/stable/installer/et/installer.xml
+++ b/docs/docs/stable/installer/et/installer.xml
@@ -6,163 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">Mageia paigaldusprogramm DrakX</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">Mageia paigaldusprogramm DrakX</title>
   </info>
 
   <para>Sõltumata sellest, kas olete GNU-Linuxi maailmas uustulnuk või juba kogenud
 kasutaja, on Mageia paigaldusprogramm loodud nii, et paigaldamine või
 uuendamine oleks kõigile võimalikult lihtne.</para>
 
-  <para>Avamenüüs näete mitmeid valikuid, kuid vaikimisi valitu käivitab
-paigaldusprogrammi, mida tavaliselt ongi vaja.</para>
+  <section>
+    <title>Paigaldamise etapid</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Paigaldusprogrammi avaekraan</title>
 
-    <section>
-      <title>Mageia DVD kasutamine</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
+
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
 
-      <para>Siin on näha Mageia DVD vaikimisi tervitusekraanid: esimest näeb UEFI
-süsteemi, teist pärandsüsteemi korral.</para>
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>Sellel ekraanil pääseb valikute juurde, kui vajutada tähte <emphasis
-role="bold">e</emphasis>, mis avab redigeerimisrežiimi. Nähtavale ekraanile
-tagasipääsemiseks vajutage klahvi <emphasis role="bold">Esc</emphasis>, et
-väljuda salvestamata, või klahvi <emphasis role="bold">Ctrl</emphasis> või
-<emphasis role="bold">F10</emphasis>, et väljuda tehtud valikuid
-salvestades.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>Sellel ekraanil on võimalik määrata mõned isiklikud eelistused (pange
-tähele, et valikud <emphasis role="bold">F1</emphasis> kuni <emphasis
-role="bold">F6</emphasis> on kasutusel ainult pärandsüsteemis):<itemizedlist>
-          <listitem>
-            <para>Kõigi <emphasis role="bold">F2</emphasis> kuni <emphasis
-role="bold">F6</emphasis> valikute korral näeb asjakohast abi, kui vajutada
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para><emphasis role="bold">F2</emphasis> vajutamisel kasutab paigaldusprogramm
-paigaldamisel valitavat keelt.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Valige nooleklahvidega liikudes keel ja vajutage klahvile <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>Muuta ekraanilahutust klahvile<emphasis role="bold"> F3</emphasis> vajutades
-(ainult pärandsüsteemis)</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Kui paigaldamisel peaks tekkima raskusi, võib üritada muuta vaikeseadistusi,
-valides <emphasis role="bold">F6</emphasis> <emphasis role="bold">Kernel
-Options</emphasis> (UEFI sõsteemi korral vajutage <emphasis
-role="bold">e</emphasis>).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Vaikimisi: vaikimisi võtmeid ei muudeta.</para>
-              </listitem>
-
-              <listitem>
-                <para>Ohutud sätted: jõudlusele eelistatakse ohutust.</para>
-              </listitem>
-
-              <listitem>
-                <para>Ilma ACPI-ta: toitehalduse valikuid ei arvestata.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>Ilma kohaliku APIC-ta: see puudutab CPU katkestusi. Valige see siis, kui
-seda nõutakse.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>Mõnda neist valikutest valides muutuvad vaikimisi võtmed, mida näeb real
-<guilabel>Alglaadimise sätted</guilabel>.</para>
-
-            <note>
-              <para>Mõne Mageia väljalaske puhul võib juhtuda, et klahviga <emphasis
-role="bold">F6</emphasis> valitud kirjeid ei näe real <guilabel>Alglaadimise
-sätted</guilabel>, aga neid siiski arvestatakse.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Klahvile <emphasis role="bold">F1</emphasis> vajutades ilmub uus aken
-saadaolevate võtmetega. Valige neist vajalik ja vajutage klahvile <emphasis
-role="bold">Enter</emphasis> üksikasjade nägemiseks või klahvile <emphasis
-role="bold">Esc</emphasis> tervitusekraani juurde naasmiseks.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>Siin on näidatud võtme splash üksikasjaliku kirjelduse aken. Vajutage
-klahvile <emphasis role="bold">Esc</emphasis> või valige <guilabel>Tagasi
-alglaadimise sätete juurde</guilabel>, et minna tagasi võtmete
-loendisse. Võtmeid saab lisada käsitsi reale <guilabel>Alglaadimise
-sätted</guilabel>.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>Abi tõlgitakse keelde, mis on valitud klahviga <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>Täpsemat teavet kerneli võtmete kohta tavapärases ja UEFI süsteemis leiab
-meie Wiki-lehelt <link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>Paigaldamise etapid</title>
+    <section>
+      <title>UEFI Systems</title>
+
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
+
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Paigaldamine on jagatud mitmeks etapiks, mille loetelu näeb ekraani
-külgpaneelil vasakul.</para>
-
-    <para>Igal etapil kohtate üht või enamat ekraani, millel võib olla ka nupp
-<guibutton>Muud valikud</guibutton>, mis avab täiendavad ja harvemini
-vajalikud valikud.</para>
-
-    <para>Enamikul ekraanidel on nupp <guibutton>Abi</guibutton>, mis selgitab antud
-etappi põhjalikumalt.</para>
-
-    <note>
-      <para>Kui soovite mingil hetkel paigaldamise katkestada, võite ka teha arvutile
-taaskäivituse, aga palun mõelge enne seda hoolikalt järele. Kui partitsioon
-on vormindatud või uuendusi on hakatud paigaldama, ei ole arvuti enam
-varasemas olekus ning taaskäivitamise tulemus võib olla mittetöötav
-masin. Kui te ikkagi olete kindel, et just taaskäivitus on õige samm, minge
-tekstiterminali, vajutades korraga kolme klahvi <guibutton>Alt Ctrl
-F2</guibutton>. Seejärel vajutage taaskäivitamiseks korraga klahve
-<guibutton>Alt Ctrl Delete</guibutton>.</para>
-    </note>
+      <itemizedlist>
+        <title>Menu</title>
+
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -173,19 +174,20 @@ F2</guibutton>. Seejärel vajutage taaskäivitamiseks korraga klahve
 
       <itemizedlist>
         <listitem>
-          <para>Pärast avaekraani ei tulegi keele valiku ekraani ette. See võib juhtuda mõne
-graafikakaardi ja vanema süsteemi korral.  Proovige kasutada madalamat
-ekraanilahutust, kirjutades käsureale <code>vgalo</code>.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
-          <para>Kui riistvara on väga vana, ei pruugi graafiline paigaldamine üldse võimalik
-olla. Sel juhul võib proovida tekstipõhist paigaldamist. Selleks vajutage
-avaekraanil viibides klahvile <emphasis role="bold">ESC</emphasis> ja
-kinnitage valikut klahvi <emphasis role="bold">ENTER</emphasis>
-vajutamisega. Teie ette ilmub must ekraan sõnaga "boot:".  Kirjutage "text"
-ja vajutage <emphasis role="bold">ENTER</emphasis>. Nüüd saate jätkata
-tekstipõhise paigaldamisega.</para>
+          <para>If the hardware is very old, a graphical installation may not be
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -193,30 +195,30 @@ tekstipõhise paigaldamisega.</para>
     <section>
       <title>Paigaldamine hangub</title>
 
-      <para>Kui süsteem paistab paigaldamise käigus hanguvat, võib olla raskusi
-riistvara tuvastamisega. Sel juhul võib riistvara automaatse tuvastamise
-vahele jätta ja sellega hiljem tegelda. Selleks kirjutage käsureale
-<code>noauto</code>. Vajaduse korral võib seda võtit kasutada koos teiste
-võtmetega.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
       <title>RAM-i probleem</title>
 
-      <para>Neid läheb väga harva vaja, kuid mõnel juhul võib riistvara teatada valesti
-saadaoleva mälu (RAM) suuruse. Selle käsitsi määramiseks tuleb kasutada
-parameetrit <code>mem=xxxM</code>, kus xxx on korrektne mälu suurus. Näiteks
-<code>mem=256M</code> määrab, et kasutada on 256 MB mälu.</para>
+      <para>This will rarely be needed, but in some cases the hardware may report the
+available RAM incorrectly. To specify this manually, you can use the
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dünaamilised partitsioonid</title>
 
-      <para>Kui olete valinud oma kõvaketta vorminguks Microsoft Windowsi all <emphasis
-role="bold">dynamic</emphasis> tavalise <emphasis
-role="bold">basic</emphasis> asemel, siis arvestage, et Mageiat ei saa
-sellisele kettale paigaldada. Kuidas tavalisele kettavormingule tagasi
-minna, saab lugeda Microsofti dokumentatsioonist: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/et/locale.xml b/docs/docs/stable/installer/et/locale.xml
new file mode 100644
index 00000000..bb7bd9a7
--- /dev/null
+++ b/docs/docs/stable/installer/et/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/et/login.xml b/docs/docs/stable/installer/et/login.xml
index c4cc6632..069d524d 100644
--- a/docs/docs/stable/installer/et/login.xml
+++ b/docs/docs/stable/installer/et/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="et"><info><title xml:id="label-to-adapt-ti1">Sisselogimisekraan</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM-i sisselogimisekraan</para></caption></mediaobject><para>Lõpuks ilmub sisselogimisekraan.</para><para>Kirjutage oma kasutajanimi ja parool ning mõne hetke pärast ilmub teie ette
-juba KDE või GNOME töölaud vastavalt sellele, millist live-andmekandjat te
-kasutate. Nüüd võite oma vastset Mageiat kasutama hakata.</para><para>Rohkem teavet leiab <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">Mageia
-wikist</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="et">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/media_selection.xml b/docs/docs/stable/installer/et/media_selection.xml
index 4568298d..791de056 100644
--- a/docs/docs/stable/installer/et/media_selection.xml
+++ b/docs/docs/stable/installer/et/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Andmekandjate valik (mittevaba tarkvara)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Siin näeb saadaolevate tarkvarahoidlate nimekirja. Sõltuvalt paigaldamiseks
 valitud andmekandjast võib saadaval olla ainult osa võimalikke
@@ -32,11 +41,11 @@ see sisaldab distributsiooni põhikomponente.</para>
     </listitem>
 
     <listitem>
-      <para>Hoidla <emphasis>Nonfree</emphasis> (mittevaba tarkvara) sidaldab pakette,
-mis on küll tasuta, nii et Mageia võib neid levitada, aga sisaldavad kinnise
-lähtekoodiga tarkvara (sellest ka nimi "mittevaba" ehk "non-free"). Näiteks
-sisaldab see hoidla nVidia ja ATI graafikakaartide omanduslikke draivereid,
-mitmesuguste WiFi-kaartide püsivara jms.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/et/minimal-install.xml b/docs/docs/stable/installer/et/minimal-install.xml
index 944ded00..371b03b7 100644
--- a/docs/docs/stable/installer/et/minimal-install.xml
+++ b/docs/docs/stable/installer/et/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="et">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="et">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Minimaalne paigaldus</title>
   </info>
@@ -10,29 +13,44 @@
 
   
 
-  <para>Kui paketigruppide ekraanil jätta kõik valimata, saab kasutada minimaalset
-paigaldust, vt. <xref linkend="choosePackageGroups"/></para>
-
-  <para>Soovi korral võite samal ekraanil ära märkida valiku <emphasis
-role="bold">Valik paketthaaval</emphasis>.</para>
-
-  <para>Minimaalne paigaldus on mõeldud neile, kel mõlgub
-<application>Mageia</application> jaoks meeles midagi erilist, näiteks
-server või spetsiaalne tööjaam. Tõenäoliselt oleks seda mõttekas kasutada
-koos <emphasis role="bold">pakettide ükshaaval</emphasis> valimisega,
-vt. <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>Kui valite niisuguse paigaldamise, saab järgmisel ekraanil üht-teist
-täpsustada, näiteks lasta paigaldada ka dokumentatsioon või X.</para>
+  
 
-  <para>Kui märkida <emphasis role="bold">X'iga</emphasis>, paigaldatakse ka
-kergekaaluline töökeskkond IceWM.</para>
+  
 
-  <para>Baasdokumentatsioon tähendab man- ja info-lehekülgi. See sisaldab <link
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
-Projecti</link> manuaalilehekülgi ja paketi <link
+Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
-coreutils</link> info-lehekülgi.</para>
+coreutils</link> info pages.</para>
 
   <mediaobject>
 <imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
diff --git a/docs/docs/stable/installer/et/misc-params.xml b/docs/docs/stable/installer/et/misc-params.xml
index dacf2312..25e158e2 100644
--- a/docs/docs/stable/installer/et/misc-params.xml
+++ b/docs/docs/stable/installer/et/misc-params.xml
@@ -1,17 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Seadistuste kokkuvõte</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
-
-  <para xml:id="misc-params-pa1" revision="1">DrakX langetab teie süsteemi seadistamisel mõistlikud otsused vastavalt Teie
-valikutele ja tuvastatud riistvarale. Siin saab neid seadistusi üle vaadata
-ja vajaduse korral muuta, klõpsates <guibutton>Seadista</guibutton>.</para>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+  <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>Rusikareeglina on soovitatav kasutada vaikimisi seadistusi - välja arvatud
@@ -25,7 +42,7 @@ mõnel erandjuhul:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>veel midagi, millest on üksikasjalikumalt juttu allpool</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -37,47 +54,47 @@ mõnel erandjuhul:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Ajavöönd</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX määrab vastavalt valitud keelele ajavööndi. Soovi korral saab seda
-muuta. Vt ka <xref linkend="configureTimezoneUTC"/></para>
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Riik / Piirkond</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">Kui Te ei viibi valitud riigis, on väga oluline see siin õigeks
 parandada. Vt <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Alglaadur</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX langetab tavaliselt alglaaduri osas hea ja õige valiku.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Kui Te just väga täpselt ei tea, kuidas Grub2 seadistada, ei tasu siin
-midagi muuta.</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Täpsemalt kõneleb sellest <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Kasutajate haldamine</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Siin saab lisada uusi kasutajaid. Nad kõik saavad oma isikliku
-<literal>/home</literal> kataloogi.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Teenused</guilabel></para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">Süsteemi teenused tähendavad väikseid programme, mis töötavad taustal
 (deemonid). See tööriist võimaldab teatavaid ülesandeid lubada või keelata.</para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Enne millegi muutmist tuleks hoolikalt mõelda - eksimuse korral ei pruugi
-arvuti enam korralikult töötada.</para>
-
-        <para>Täpsemalt kõneleb sellest <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -89,7 +106,7 @@ arvuti enam korralikult töötada.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Klaviatuur</guilabel></para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Siin saab määrata või muuta klaviatuuripaigutust, mis sõltub valitud
 asukohast, keelest ja klaviatuuritüübist.</para>
@@ -101,27 +118,32 @@ pidage meeles, et muutuvad ka paroolid.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Hiir</guilabel></para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Siin saab lisada või seadistada mitmesuguseid osutusseadmeid: hiiri,
 puuteplaate jms.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Helikaart</guilabel></para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">Paigaldusprogramm kasutab vaikimisi draiverit, kui see on olemas. Võimalus
-valida teist draiverit antakse ainult siis, kui helikaardile on olemas mitu
-draiverit, aga ükski neist ei ole vaikimisi draiver.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Graafiline kasutajaliides</guilabel></para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Siin saab seadistada graafikakaarte ja monitore.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Täpsemalt kõneleb sellest <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -136,12 +158,12 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Võrk</guilabel></para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
-        <para xml:id="misc-params-network-pa2" revision="1">Siin saab seadistada võrgu, kuid võrgukaartide korral, mis kasutavad
-mittevabu draivereid, on seda parem teha pärast taaskäivitust
-<application>Mageia juhtimiskeskuses</application>, kui Te pole veel lubanud
-mittevaba tarkvara hoidlate kasutamist.</para>
+        <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
+repositories.</para>
 
         <warning>
           <para xml:id="misc-params-network-pa3" revision="1">Võrgukaardi lisamisel ärge unustage seadistamast tulemüüri, et ka lisatud
@@ -150,13 +172,14 @@ kaarti jälgitaks.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Puhverserverid</guilabel></para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">Puhverserver on omamoodi vahendaja Teie arvuti ja interneti vahel. Siin saab
-panna arvuti kasutama puhverservereid.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">Vajalike parameetrite täpsustamiseks võib olla vajalik pidada nõu oma
-süsteemiadministraatoriga.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -168,26 +191,31 @@ süsteemiadministraatoriga.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Turbetase</guilabel></para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Siin saab määrata oma arvuti turbetaseme. Enamasti peaks normaalseks
-kasutamiseks kõlbama vaikimisi seadistused (valik Standardne).</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Valige tase, mis paistab Teie vajadusi kõige paremini rahuldavat.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Tulemüür</guilabel></para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">Tulemüür on mõeldud tõkkeks Teie tähtsate andmete ja internetis luuravate
-röövloomade vahel, kes üritavad neid varastada või rikkuda.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Valige teenused, millel lubate oma süsteemile ligi pääseda. Valik sõltub
-mõistagi sellest, milleks Te oma arvutit kasutada soovite. Täpsemat teavet
-vt <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Pange tähele, et kõige lubamine (st tulemüür puudub) võib olla väga ohtlik.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/et/reboot.xml b/docs/docs/stable/installer/et/reboot.xml
index f4828839..0c55273e 100644
--- a/docs/docs/stable/installer/et/reboot.xml
+++ b/docs/docs/stable/installer/et/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="et" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Taaskäivitamine</title>
   </info>
   
-  <para>Kui alglaadur on paigaldatud, palutakse teil arvuti seisata, Live-CD
-eemaldada ja arvuti taaskäivitada. Klõpsake nupule <emphasis
-role="bold"><guibutton>Lõpeta</guibutton></emphasis> ja talitage, nagu
-nõutud - ning <emphasis role="bold">just sellises järjekorras!</emphasis></para>
+  
+  <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>Taaskäivitamise järel näete allalaadimise edenemisribasid. Need annavad
-märku, et parajasti laaditakse alla tarkvaraallikaid (vt täpsemalt
-tarkvarahalduse osast).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/et/securityLevel.xml b/docs/docs/stable/installer/et/securityLevel.xml
index 6a4fcfe6..526ced1a 100644
--- a/docs/docs/stable/installer/et/securityLevel.xml
+++ b/docs/docs/stable/installer/et/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Turbetase</title>
   </info>
@@ -7,26 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Palun valige sobiv turbetase</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standardne</emphasis> on vaikevalik ja soovitatav
-tavalisele kasutajale. <emphasis role="bold">Turvaline</emphasis> loob väga
-kaitstud süsteemi, mida on vaja näiteks avaliku serveri ülesseadmisel.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Turbeadministraator</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">Siin saab määrata e-posti aadressi, millele süsteem saadab
+  <para revision="1" xml:id="securityLevel-pa2">Siin saab määrata e-posti aadressi, millele süsteem saadab
 <emphasis>turbehoiatusi</emphasis>, kui avastatakse olukord, mis nõiab
 süsteemiadministraatori teavitamist.</para>
 
-  <para>Hea ja hõlpus viis on kirjutada siia &lt;kasutaja>@localhost - kus
-&lt;kasutaja> on selle kasutaja kasutajanimi, kes neid teateid saama peab.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>Süsteem läkitab niisugused teated teele <emphasis role="bold">Unixi
@@ -35,6 +47,6 @@ tähendab, et kasutaja peab ühtlasi olema seadistatud niisuguseid teateid
 saama!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">Pärast paigaldamist on alati võimalik turvalisusega seotud seadistusi muuta
-Mageia juhtimiskeskuse sektsioonis <guilabel>Turvalisus</guilabel>.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/et/selectCountry.xml b/docs/docs/stable/installer/et/selectCountry.xml
index e0ef83fd..7d411ead 100644
--- a/docs/docs/stable/installer/et/selectCountry.xml
+++ b/docs/docs/stable/installer/et/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="et">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="et">
   <info>
     <title xml:id="selectCountry-ti1">Riigi / piirkonna valimine</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Valige oma riik või piirkond. See on oluline paljudele muudele
-seadistustele, näiteks vääring või juhtmeta side regulatsioonipiirkond. Vale
-riigi määramisel võib juhtuda, et te ei saagi juhtmeta võrku kasutada.</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+like the currency and wireless regulatory domain. Setting the wrong country
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">Kui teie riiki nimekirjas pole, klõpsake nupule <guilabel>Muud
-valikud</guilabel> ja valige oma riik / piirkond sealt.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">Kui teie riik esineb ainult <guilabel>muude valikute</guilabel> nimekirjas,
-siis võib pärast <guibutton>Olgu</guibutton> klõpsamist paista, nagu oleks
-valitud riik esimesest nimekirjast. Ärge laske ennast sellest häirida, DrakX
-arvestab teie tegeliku valikuga.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,19 +40,19 @@ arvestab teie tegeliku valikuga.</para>
       <title xml:id="inputMethod-ti7">Sisestusmeetod</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1"><guilabel>Muude riikide</guilabel> ekraanil saab ka valida sisestusmeetodi
-(nimekirjast allpool). See võimaldab kasutajal sisestada keerukate
-märgisüsteemide märke (hiina, jaapani, korea jm kirjad). IBus on vaikimisi
-sisestusmeetod, nii et kasutaja ei pea seda ise käsitsi määrama.  Teised
-sisestusmeetodid (SCIM, GCIN, HIME jne) pakuvad sarnaseid võimalusi ning
-neid saab paigaldada, kui lisada enne paketivalikut HTTP või FTP
-andmekandja.</para>
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
+input method (at the bottom of the list). Input methods allow users to input
+multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
+default input method, so users should not need to configure it
+manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
+functions and can be installed if you added HTTP/FTP media before package
+selection.</para>
 
     <note>
-      <para xml:id="selectCountry-pa5" revision="1">Kui jätsite paigaldamise ajal sisestusmeetodi valimata, saab seda teha
-pärast paigaldatud süsteemi laadimist, valides <emphasis role="bold">Arvuti
-seadistamine</emphasis> -> <emphasis role="bold">Süsteem</emphasis> või
-käivitades administraatorina localedrake'i.</para>
+      <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/selectInstallClass.xml b/docs/docs/stable/installer/et/selectInstallClass.xml
index 803de53c..bec46864 100644
--- a/docs/docs/stable/installer/et/selectInstallClass.xml
+++ b/docs/docs/stable/installer/et/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="et" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,56 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Paigaldamine või uuendamine</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Paigaldamine</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Selle valimisel saab ette võtta <application>Mageia</application> värske
-paigalduse. Sellega vormindatakse juurpartitsioon (/), kuid eraldi asuv
-/home partitsioon on võimalik alles hoida.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Uuendamine</para>
-
-      <para>Selle valimisel saab ette võtta olemasoleva
-<application>Mageia</application> paigalduse uuendamise.</para>
-
-      <warning>
-        <para>Põhjalikult testitud on uuendamine ainult selliselt varasemalt Mageia
-versioonilt, mis oli <emphasis>veel toetatud</emphasis> ajal, mil ilmus
-praegune paigaldusprogrammi versioon. Kui soovite uuendada Mageia
-versioonilt, mille ametlik toetamine oli lõppenud juba enne praeguse
-paigaldusprogrammi ilmumist, siis on mõistlikum võtta ette pigem uus
-paigaldus (selle juures tasub mõistagi jätta alles oma
-<literal>/home</literal>-partitsioon).</para>
-      </warning>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
+
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>Kui soovite mingil hetkel paigaldamise katkestada, võite ka teha arvutile
-taaskäivituse, aga palun mõelge enne seda hoolikalt järele. Kui partitsioon
-on vormindatud või uuendusi on hakatud paigaldama, ei ole arvuti enam
-varasemas olekus ning taaskäivitamise tulemus võib olla mittetöötav
-masin. Kui te ikkagi olete kindel, et just taaskäivitus on õige samm, minge
-tekstiterminali, vajutades korraga kolme klahvi <guilabel>Alt Ctrl
-F2</guilabel>. Seejärel vajutage taaskäivitamiseks korraga klahve
-<guilabel>Alt Ctrl Delete</guilabel></para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
-    <para>Kui avastate, et olete unustanud mõne keele lisada, saab <emphasis
-role="bold">Paigaldamise või uuendamise</emphasis> ekraanilt naasta
-keelevaliku juurde, vajutades korraga klahve <guilabel>Alt Ctrl
-Home</guilabel>.  <emphasis role="bold">Ärge</emphasis> tehke seda hilisema
-paigalduse käigus.</para>
+    <para>If you have discovered that you forgot to select an additional language, you
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/et/selectKeyboard.xml b/docs/docs/stable/installer/et/selectKeyboard.xml
index 9dfd0283..ec319086 100644
--- a/docs/docs/stable/installer/et/selectKeyboard.xml
+++ b/docs/docs/stable/installer/et/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,19 +19,22 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Klaviatuur</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX valib teie keelele sobiva klaviatuuri. Kui sobivat klaviatuuri ei
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX valib teie keelele sobiva klaviatuuri. Kui sobivat klaviatuuri ei
 leita, kasutatakse vaikimisi US klaviatuuripaigutust.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Kontrollige, kas valik on õige, ja valige vajaduse korral mõni muu
+      <para revision="1" xml:id="selectKeyboard-pa2">Kontrollige, kas valik on õige, ja valige vajaduse korral mõni muu
 klaviatuuripaigutus. Kui te ei tea, millise paigutusega teie klaviatuur on,
 uurige süsteemi dokumentatsiooni või küsige järele tarnijalt. Klaviatuuri
 küljes võib isegi olla silt, mis ütleb, millise paigutusega on tegu. Samuti
@@ -27,21 +43,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">Kui teie klaviatuuri nimekirjas ei ole, klõpsake täieliku loetelu nägemiseks
-<guibutton>Veel</guibutton> ja valige oma klaviatuur sealt.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">Olles valinud klaviatuuri pärast nupule <guibutton>Veel</guibutton>
-klõpsamist, võite esimese dialoogi juurde naastes näha, nagu oleks valitud
-mõni sealne klaviatuur. Ärge laske ennast sellest häirida: arvestatakse
-ikkagi seda, millise klaviatuuri te tegelikult täisnimekirjas olete valinud.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">Kui valite klaviatuuri, mis ei kasuta ladina tähti, näete lisadialoogi, mis
+      <para revision="1" xml:id="selectKeyboard-pa4">Kui valite klaviatuuri, mis ei kasuta ladina tähti, näete lisadialoogi, mis
 palub määrata, kuidas eelistate lülituda ladina ja mitteladina
 klaviatuuripaigutuste vahel.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/et/selectKeyboardLive.xml b/docs/docs/stable/installer/et/selectKeyboardLive.xml
index 75cbb2c1..635dcebe 100644
--- a/docs/docs/stable/installer/et/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/et/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Klaviatuuri valimine</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>Teil palutakse määrata klaviatuuripaigutus, mida soovite Mageias
-kasutada. Vaikimisi valitu vastab keelele ja ajavööndile, mille varem
-valisite.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/et/selectLanguage.xml b/docs/docs/stable/installer/et/selectLanguage.xml
index d63e74c5..398a5cad 100644
--- a/docs/docs/stable/installer/et/selectLanguage.xml
+++ b/docs/docs/stable/installer/et/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,49 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Kasutatava keele valimine</title>
   </info>
 
-  <para condition="classical">Valige vajalik keel, laiendades nimekirja kõigepealt maailmajao järgi.
-<application>Mageia</application> kasutab langetatud valikut nii
-paigaldamise ajal kui ka paigaldatud süsteemis.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Valige vajalik keel.  <application>Mageia</application> kasutab langetatud
-valikut nii paigaldamise ajal kui ka paigaldatud süsteemis.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">Kui teie süsteemi tuleks paigaldada mitu keelt kas teie enda või teiste
-kasutajate tarbeks, siis tuleks nupule <guibutton>Mitme keele
-valimine</guibutton> klõpsates need kõik kohe lisada. Pärast paigaldamist on
-uute keelte lisamine juba palju keerulisem.</para>
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
-    <para>Isegi kui paigaldate mitu keelt, tuleb üks neist valida esimesel ekraanil
-eelistatud keeleks. See keel on märgitud ka mitme keele valimise ekraanil.</para>
-  </warning>
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
-      <para>Kui klaviatuuri keel ei sobi kokku eelistatud keelega, oleks mõistlik
-paigaldada kohe ka klaviatuurile vastav keel.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia toetab vaikimisi UTF-8 (Unicode).</para>
-
-      <para condition="classical">Selle võib keelata <emphasis role="bold">mitme keele valimise</emphasis>
-ekraanil, kui olete kindel, et see teie keelele kohe üldse ei sobi. UTF-8
-keelamine rakendub kõigile paigaldatavatele keeltele.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>Oma süsteemi keelt saab pärast paigaldamist muuta, valides Mageia
-juhtimiskeskus -> Süsteem -> Süsteemi lokaliseerimine.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/et/selectMouse.xml b/docs/docs/stable/installer/et/selectMouse.xml
index 6fe43ba7..f84a98e2 100644
--- a/docs/docs/stable/installer/et/selectMouse.xml
+++ b/docs/docs/stable/installer/et/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="et">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Hiire valimine</title>
   </info>
@@ -7,24 +13,28 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
+<!--2018/02/15 apb: Text and typography.-->
 <imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
-format="PNG" /> </imageobject></mediaobject>
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Kui te ei ole rahul oma hiire tööga, saate siit valida mõne teise.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Tavaliselt on mõistlik valik <guilabel>Universaalne</guilabel> -
-<guilabel>Suvaline PS/2 ja USB hiir</guilabel>.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Valige <guilabel>Universaalne</guilabel> - <guilabel>Evdev jõuga</guilabel>,
-et seadistada nuppe, mis peaksid töötama kuue või rohkema nupuga hiirel.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/et/setupBootloader.xml b/docs/docs/stable/installer/et/setupBootloader.xml
index 041ade09..35df273c 100644
--- a/docs/docs/stable/installer/et/setupBootloader.xml
+++ b/docs/docs/stable/installer/et/setupBootloader.xml
@@ -1,154 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="et" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="et" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Alglaaduri põhiseadistused</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Alglaaduri liides</title>
-    <para>Vaikimisi kasutab Mageia üht kahest võimalusest:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>Grub2 (graafilise menüüga või ilma selleta) pärand/MBR või pärand/GPT
-süsteemi korral</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>Grub2-efi UEFI süsteemi korral</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>Mageia graafiline menüü näeb kena välja :)</para>
-    </tip>
-    <section>
-      <title>Grub2 pärand/MBR ja pärand/GPT süsteemis</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Ärge muutke <emphasis role="bold">Alglaadimisseadet</emphasis>, kui te pole
-täiesti kindel, et teate, mida teete.</para>
-    </section>
-    <section>
-      <title>Grub2-efi UEFI süsteemis</title>
-      <para>UEFI süsteemi korral on kasutajaliides pisut teistsugune, sest te ei saa
-valida graafilise menüü <emphasis role="bold">kasutamist</emphasis> või
-<emphasis role="bold">kasutamata jätmist</emphasis>.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>Kui Mageia on ainuke süsteem, mis on teie arvutisse paigaldatud, loob
-paigaldusprogramm ESP (EFI süsteemse partitsiooni) alglaaduri (Grub2-efi)
-tarbeks. Kui arvutisse on juba paigaldatud UEFI operatsioonisüsteeme
-(näiteks Windows 8), tuvastab Mageia paigaldusprogramm Windowsi loodud ESP
-ja lisab sellele Grub2-efi. ESP-sid võib küll põhimõtteliselt olla ka mitu,
-aga väga soovitatav on siiski kasutada ainult üht sõltumata sellest, kui
-palju on arvutis operatsioonisüsteeme.</para>
-      <para>Ärge muutke <emphasis role="bold">Alglaadimisseadet</emphasis>, kui te pole
-täiesti kindel, et teate, mida teete.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Mageia alglaaduri kasutamine</title>
-    <para>Vaikimisi kirjutab Mageia sõltuvalt süsteemist uue:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>Grub2 alglaaduri kas Teie esimese kõvaketta MBR-i (Master Boot Record) või
-BIOS-e alglaadepartisioonile</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>Grub2-efi alglaaduri ESP-le</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>Kui arvutisse peaks olema paigaldatud teisigi operatsioonisüsteeme, püüab
-Mageia lisada need oma alglaadimismenüüsse. Kui Te seda ei soovi, klõpsake
-<guibutton>Järgmine</guibutton> ja eemaldage märge kastikesest <emphasis
-role="bold">Võõraste operatsioonisüsteemide otsimine</emphasis></para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Olemasoleva alglaaduri kasutamine</title>
-    <para>Täpne protseduur, kuidas lisada Mageia süsteem olemasolevale alglaadurile,
-väljub käesoleva abiteksti raamest, kuid enamasti tähendab see asjakohase
-alglaaduri paigaldamise programmi käivitamist, mis tuvastab ja lisab selle
-automaatselt. Uurige selle kohta lähemalt vastava operatsioonisüsteemi
-dokumentatsiooni.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Ahellaadimise kasutamine</title>
-    <para>Kui Te ei soovi alglaaditavat Mageiat, vaid tahate seda laadida mõnest
-teisest operatsioonisüsteemist, siis klõpsake
-<guibutton>Järgmine</guibutton>, seejärel <guibutton>Muu</guibutton> ja
-märkige ära kastike <guilabel>ESP-i ega MBR-i ei puudutata</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>Näete hoiatust, et alglaadur puudub. Eirake seda ja klõpsake
-<guibutton>Olgu</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
   </section>
   <section>
-    <title>Valikud</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>Esimene kaart</title>
-      <para><itemizedlist><listitem><para><guilabel>Ooteaeg alglaadimisel</guilabel>: selles kastis saab panna paika,
-kui mitu sekundit oodatakse, enne kui käivitatakse vaikimisi
-operatsioonisüsteem.</para></listitem><listitem><para><guilabel>Turvalisus</guilabel>: siin saab määrata alglaaduri
-parooli. Sellisel juhul küsitakse alglaadimise ajal kasutajanime ja parooli,
-kui soovite valida mõnda alglaadimiskirjet või seadistusi
-muuta. Kasutajanimeks on <emphasis role="bold">root</emphasis>, parooli
-saate siin ise määrata.</para></listitem><listitem><para><guilabel>Parool</guilabel>: selles kastis saab parooli kindlaks määrata.</para></listitem><listitem><para><guilabel>Parool (uuesti)</guilabel>: siia tuleb parool teist korda
-kirjutada, mille järel Drakx kontrollib, kas see ikka sobib kokku sellega,
-mille sisestasite esimesel korral.</para></listitem><listitem><para><guilabel>Edasijõudnuile</guilabel></para><itemizedlist><listitem><para><guilabel>ACPI lubamine:</guilabel> ACPI (täiustatud konfiguratsiooni- ja
-toiteliides) on toitehalduse standard. See võib säästa energiat, lülitades
-välja kasutamata seadmed. Sama meetodit kasutas varem APM. Selle valimata
-jätmine võib aga olla kasulik, kui Teie arvuti ei toeta ACPI-t või Te
-arvate, et ACPI võib põhjustada mingeid probleeme (näiteks suvalisi
-taaskäivitusi või süsteemi hangumisi).</para></listitem><listitem><para><guilabel>SMP lubamine</guilabel>: see valik lülitab sisse või välja
-sümmeetrilise mitmiktöötluse mitme tuumaga protsessorite korral.</para></listitem><listitem><para><guilabel>APIC lubamine</guilabel>: selle lubamine või keelamine annab
-operatsioonisüsteemile või võtab sellelt ligipääsu täiustatud
-programmeeritavale katkestuste kontrollerile. APIC-seadmed võimaldavad
-keerulisemaid prioriteedi määramise mudeleid ja täiustatud IRQ
-(katkestusnõuded) haldamist.</para></listitem><listitem><para><guilabel>Kohaliku APIC lubamine</guilabel>: siin saab lubada või keelata
-kohaliku APIC, mis haldab kõiki konkreetse protsessori väliseid katkestusi
-SMP-süsteemis.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Alglaaduri põhiseadistused</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Järgmine kaart</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Vaikimisi:</guilabel> vaikimisi käivitatav operatsioonisüsteem.</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Lisaargumendid:</guilabel> siin saab edastada kernelile vajalikku
-teavet või lasta kernelil alglaadimise ajal anda rohkem teavet.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Võõraste operatsioonisüsteemide otsimine</guilabel>: vt eespool
-osa <link linkend="setupMageiaBootloader">Mageia alglaaduri
-kasutamine</link>.</para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Edasijõudnuile</guilabel><itemizedlist><listitem><para><guilabel>Videorežiim:</guilabel> siin saab määrata ekraani suuruse ja
-värvisügavuse, mida alglaadur kasutab. Allapoole kolmnurgale klõpsates saab
-vaiida muute suuruse ja värvisügavuse valikute seast.</para></listitem><listitem><para><emphasis role="bold">ESP-i ega MBR-i ei puudutata</emphasis>: vt eespool
-osa <link linkend="setupChainLoading">Ahellaadimise kasutamine</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Olemasoleva alglaaduri kasutamine</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Alglaadimismenüü kirje lisamine või muutmine</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/setupSCSI.xml b/docs/docs/stable/installer/et/setupSCSI.xml
index ec01c4ea..1fe2828c 100644
--- a/docs/docs/stable/installer/et/setupSCSI.xml
+++ b/docs/docs/stable/installer/et/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">SCSI seadistamine</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX tuvastab tavaliselt kõvakettad korrektselt. Mõne vanema SCSI
 kontrolleri korral aga ei suudeta korrektselt tuvastada vajalikku draiverit
 ja seetõttu ka ketast ära tunda.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">Kui nii peaks juhtuma, tuleb DrakX-ile käsitsi selgeks teha, millised SCSI
-seadmed teil on.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">Seejärel peaks DrakX olema võimeline kettad korrektselt seadistama.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/et/software.xml b/docs/docs/stable/installer/et/software.xml
new file mode 100644
index 00000000..9ddd8eff
--- /dev/null
+++ b/docs/docs/stable/installer/et/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="et" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/et/soundConfig.xml b/docs/docs/stable/installer/et/soundConfig.xml
index 1f1aa7d5..21e5c41f 100644
--- a/docs/docs/stable/installer/et/soundConfig.xml
+++ b/docs/docs/stable/installer/et/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Heli seadistamine</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Siin näeb draiveri nime, mille paigaldusprogramm on välja valinud teie
-helikaardile ja millest saab vaikimisi draiver.</para>
+  
 
-  <para>Vaikimisi draiver peaks töötama probleemideta. Kui siiski esineb pärast
-paigaldamist probleeme heliga, andke käsk <command>draksound</command> või
-käivitage sama tööriist Mageia juhtimiskeskuses, valides seal külgpaneelil
-<guilabel>Riistvara</guilabel> ning klõpsates ilmuvas aknas ülal paremal
-asuvale ikoonile <guilabel>Heli seadistamine</guilabel>.</para>
+  
 
-  <para>Seejärel klõpsake <emphasis role="bold">draksoundi</emphasis> ehk <emphasis
-role="bold">Heli seadistamise</emphasis> tööriistas nupule
-<guibutton>Probleemi otsimine</guibutton>, kust leiab mitmeid häid
-soovitusi, kuidas hädast üle saada.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Muud valikud</title>
     </info>
 
-    <para>Klõpsamisest nupule <emphasis role="bold"><guibutton>Muud
-valikud</guibutton></emphasis> võib paigaldamise ajal abi olla, kui
-vaikimisi draiverit ei ole, küll on aga saada mitu draiverit ning te arvate,
-et paigaldusprogramm on valinud neist vale.</para>
-
-    <para>Sellisel juhul saate valida mõne muu draiveri, kui klõpsate nupule <emphasis
-role="bold"><guibutton>Suvalise draiveri valimine</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/et/takeOverHdConfirm.xml b/docs/docs/stable/installer/et/takeOverHdConfirm.xml
index fe6654a0..9b30241f 100644
--- a/docs/docs/stable/installer/et/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/et/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Kõvaketta vormindamise kinnitamine</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,14 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Klõpsake <guibutton>Tagasi</guibutton>, kui te ei ole oma valikus kindel.</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
+choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Klõpsake <guibutton>Edasi</guibutton>, kui olete kindel ning soovite
-kustutada kõvakettal kõik partitsioonid, kõik operatsioonisüsteemid ja üldse
-kõik andmed.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/et/testing.xml b/docs/docs/stable/installer/et/testing.xml
index c500c65d..0c78f6ca 100644
--- a/docs/docs/stable/installer/et/testing.xml
+++ b/docs/docs/stable/installer/et/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Mageia proovimine Live-süsteemina</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Mageia proovimine Live-süsteemina</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,21 +17,20 @@
       <title xml:id="testing1-ti1">Live-režiim</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>See ekraan ilmub, kui valida "Mageia laadimine". Kui seda ei juhtu, jõuate
-sammu <link linkend="doPartitionDisks">Partitsioneerimine</link> juurde.</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Riistvara järeleproovimine</title>
       </info>
 
-      <para>Üks Live-režiimi eesmärke on järele proovida, kas Mageia suudab riistvara
-korrektselt hallata. Sel juhul saab näiteks Mageia juhtimiskeskuse riistvara
-sektsioonis kontrollida, kas ikka kõigil seadmetel on draiver olemas. Järele
-saab proovida enamiku seadmeid:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -36,11 +38,7 @@ saab proovida enamiku seadmeid:</para>
         </listitem>
 
         <listitem>
-          <para>videokaart: kui nägite eelmist ekraani, on sellega kõik korras</para>
-        </listitem>
-
-        <listitem>
-          <para>veebikaamera</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -48,7 +46,7 @@ saab proovida enamiku seadmeid:</para>
         </listitem>
 
         <listitem>
-          <para>printer: seda saab seadistada ja testlehekülje välja trükkida</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -56,10 +54,13 @@ saab proovida enamiku seadmeid:</para>
         </listitem>
       </itemizedlist>
 
-      <para>Kui kõik on korras, võib paigaldamisega jätkata. Kui mitte, siis saab
-lihtsalt väljuda.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>Siin langetatud seadistamisvalikud jäetakse paigaldamise käigus meelde.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -67,14 +68,14 @@ lihtsalt väljuda.</para>
         <title xml:id="testing3-ti1">Paigaldamise käivitamine</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>Mageia LiveCD või LiveDVD paigaldamiseks kõvakettale või SSD-kettale
-klõpsake lihtsalt ikoonile "Paigaldamine kõvakettale". Ilmub näidatav ekraan
-ja seejärel samm <link linkend="doPartitionDisks">Partitsioneerimine</link>,
-nagu ka otsepaigalduse korral.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/et/uninstall-Mageia.xml b/docs/docs/stable/installer/et/uninstall-Mageia.xml
index bf82d153..6df41436 100644
--- a/docs/docs/stable/installer/et/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/et/uninstall-Mageia.xml
@@ -1,33 +1,44 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="et">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="et" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Mageia eemaldamine</title>
   </info>
 
   
 
+  
+
   <para>Kui Mageia ei võida teie poolehoidu või paigaldamine ei kulge korralikult,
 võib tekkida soov sellest üldse lahti saada. Erinevalt mõnestki
 operatsioonisüsteemist Mageia arvestab teie sooviga ja võimaldab soovi
 korral ka endale täielikult selja keerata.</para>
 
-  <para>Kui olete oma andmed varundanud, taaskäivitage Mageia DVD ja valige
-<emphasis role="bold">Päästesüsteem</emphasis> ning seejärel käsk <emphasis
-role="bold">Restore Windows boot loader</emphasis>. Järgmisel arvuti
-käivitamisel ongi teie käsutuses ainult Windows, mitte enam võimalus
-operatsioonisüsteemi valida.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>Ruumi tagasisaamiseks Windowsis, mida Mageia oma partitsioonide alla võttis,
-valige <code>Start -> Control Panel -> Administrative Tools -> Computer
-Management -> Storage -> Disk Management</code>, mis avab partitsioonide
-haldamise tööriista. Mageia partitsiooni tunneb ära kirje
-<guilabel>Unknown</guilabel> ning samuti suuruse ja asukoha järgi
-kettal. Klõpsake mõnele Mageia partitsioonile hiire parema nupuga ja valige
-<guibutton>Delete</guibutton>. Ruum vabanebki.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-  <para>Kui teil on XP, saate luua uue partitsiooni ja selle vormindada (kas FAT32
-või NTFS-vormingusse). Uuele partitsioonile antakse oma täht.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>Vista või 7 korral on veel üks võimalus: saab laiendada olemasolevat
 partitsiooni, mis asub vabanenud ruumist vasakul. Leidub ka teisi
@@ -35,4 +46,4 @@ partitsioneerimistööriistu, mida saab kasutada, näiteks nii Windowsis kui ka
 Linuxis kättesaadav <emphasis role="bold">gparted</emphasis>. Nagu ikka
 partitsioonide muutmise korral, olge väga ettevaatlik ja kindlasti varundage
 eelnevalt kõik oma vähegi olulisemad andmed.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/et/unused.xml b/docs/docs/stable/installer/et/unused.xml
index bf075f8a..be957769 100644
--- a/docs/docs/stable/installer/et/unused.xml
+++ b/docs/docs/stable/installer/et/unused.xml
@@ -1,28 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="et" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="et">
   <info>
     <title xml:id="unused-ti1">Kasutuseta materjali säilitamine või kustutamine</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
 
-  <para>Sellel sammul otsib paigaldusprogramm tarbetuid lokaadi- ja
-riistvarapakette. Seejärel tehakse ettepanek need kustutada. See on üldiselt
-hea mõte, kui te just ei valmistu paigalduseks sootuks teistsugusel
-riistvaral.</para>
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>Järgmisel sammul kopeeritakse failid kõvakettale. See võtab mõne minuti
-aega. Lõpus näeb mõnda aega tühja ekraani, millest ei tasu end heidutada
-lasta.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/eu/DrakLive-cover.xml b/docs/docs/stable/installer/eu/DrakLive-cover.xml
index d0e1c774..381f1253 100644
--- a/docs/docs/stable/installer/eu/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/eu/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="eu" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="eu" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>LIVE euskarriko instalazioa</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>2015eko Urtarrila</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>LIVE euskarriko instalazioa</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageia-ren dokumentazio Ofiziala</para>
+      <para role="tagline">Mageia-ren dokumentazio Ofiziala</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Manual honetan jasotako testuak eta irudiak CC BY-SA 3.0 babespean daude
+
+      <para>Manual honetan jasotako testuak eta irudiak CC BY-SA 3.0 babespean daude
 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-            </para>
-            <para><link ns6:href="http://www.calenco.com">Calenco CMS</link>-ren laguntzarekin
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para><link ns6:href="http://www.calenco.com">Calenco CMS</link>-ren laguntzarekin
 egin da eskuliburu hau <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>-k garatuta.
-            </para>
-            <para>Boluntarioek beren aisialdian idatzi zuten. Zoaz <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>-k garatuta.</para>
+
+      <para>Boluntarioek beren aisialdian idatzi zuten. Zoaz <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentazio
-Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para> 
+Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para>
     </cover>
   </info>
+
   <article>
     <title>LIVE euskarriko instalazioa</title>
-       <para><note>
-          <para>Inork ez du ikusiko eskuliburu honetako ikus daitzekeen irudirik. Ikusiko
+
+    <para><note>
+        <para>Inork ez du ikusiko eskuliburu honetako ikus daitzekeen irudirik. Ikusiko
 dituzun irudiak zure hardwarea eta instalazioan zehar hartutako erabakien
 araberakoa izango da.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/eu/DrakLive.xml b/docs/docs/stable/installer/eu/DrakLive.xml
index ecdba25b..4a066be9 100644
--- a/docs/docs/stable/installer/eu/DrakLive.xml
+++ b/docs/docs/stable/installer/eu/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="eu" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="eu" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>LIVE euskarriko instalazioa</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>LIVE euskarriko instalazioa</title>
 
     <cover>
       <para><note>
@@ -17,9 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 egin da eskuliburu hau <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>-k garatuta.</para>
 
-      <para>Boluntarioek beren aisialdian idatzi zuten. Zoaz <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentazio
-Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</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>
 
@@ -39,7 +54,12 @@ Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +69,18 @@ Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/eu/DrakX-cover.xml b/docs/docs/stable/installer/eu/DrakX-cover.xml
index 8fbc052d..f44cd231 100644
--- a/docs/docs/stable/installer/eu/DrakX-cover.xml
+++ b/docs/docs/stable/installer/eu/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="eu" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="eu" xml:id="Quick-Startup"
+      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>DrakX-rekin Instalazioa</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>2014ko Otsaila</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>2014ko Otsaila</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageia-ren dokumentazio Ofiziala</para>
+      <para role="tagline">Mageia-ren dokumentazio Ofiziala</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>Manual honetan jasotako testuak eta irudiak CC BY-SA 3.0 babespean daude
+
+      <para>Manual honetan jasotako testuak eta irudiak CC BY-SA 3.0 babespean daude
 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para><link ns6:href="http://www.calenco.com">Calenco CMS</link>-ren laguntzarekin
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para><link ns6:href="http://www.calenco.com">Calenco CMS</link>-ren laguntzarekin
 egin da eskuliburu hau <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>-k garatuta.
-	    </para>
-            <para>Boluntarioek beren aisialdian idatzi zuten. Zoaz <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>-k garatuta.</para>
+
+      <para>Boluntarioek beren aisialdian idatzi zuten. Zoaz <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentazio
-Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para> 
+Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>DrakX-rekin Instalazioa</title>
-       <para><note>
-          <para>Inork ez du ikusiko eskuliburu honetako ikus daitzekeen irudirik. Ikusiko
+
+    <para><note>
+        <para>Inork ez du ikusiko eskuliburu honetako ikus daitzekeen irudirik. Ikusiko
 dituzun irudiak zure hardwarea eta instalazioan zehar hartutako erabakien
 araberakoa izango da.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ araberakoa izango da.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/eu/DrakX-inline.xml b/docs/docs/stable/installer/eu/DrakX-inline.xml
new file mode 100644
index 00000000..0df23d7d
--- /dev/null
+++ b/docs/docs/stable/installer/eu/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="eu" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>DrakX-rekin Instalazioa</title>
+
+    <cover>
+      <para><note>
+          <para>Inork ez du ikusiko eskuliburu honetako ikus daitzekeen irudirik. Ikusiko
+dituzun irudiak zure hardwarea eta instalazioan zehar hartutako erabakien
+araberakoa izango da.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Manual honetan jasotako testuak eta irudiak CC BY-SA 3.0 babespean daude
+<link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para><link ns6:href="http://www.calenco.com">Calenco CMS</link>-ren laguntzarekin
+egin da eskuliburu hau <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>-k garatuta.</para>
+
+      <para>Boluntarioek beren aisialdian idatzi zuten. Zoaz <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentazio
+Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/DrakX.xml b/docs/docs/stable/installer/eu/DrakX.xml
index c7ce5cd6..31874d2f 100644
--- a/docs/docs/stable/installer/eu/DrakX.xml
+++ b/docs/docs/stable/installer/eu/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="eu" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="eu" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>DrakX-rekin Instalazioa</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>DrakX-rekin Instalazioa</title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ Talde</link>ra bada eskuliburu hau hobetzen lagundu ahal baduzu.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/eu/SelectAndUseISOs2.xml b/docs/docs/stable/installer/eu/SelectAndUseISOs2.xml
index 6e3a9861..23f01df2 100644
--- a/docs/docs/stable/installer/eu/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/eu/SelectAndUseISOs2.xml
@@ -1,40 +1,75 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="eu" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Aukeratu eta erabili ISOa</title>
   </info>
   <section>
     <title>Sarrera</title>
-    <para>Mageia ISO irudi bidez banatzen da. Orri honek, irudia zure beharren arabera
-aukeratzen lagunduko dizu.</para>
-    <para>Bi media famili daude:</para>
+    <para>Mageia is distributed via ISO images. This page will help you to choose
+which image best suits your needs.</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Instalatzaile Klasikoa: baliabidea abiarazi ondoren, aukera baimentzen duen
-prozesua jarraituko duela zer jarri eta sistema nola itxuratu.. Honek emango
-dizu instalazio bat egiteko malgutasun maximoa, bereziki, bertan jarriko den
-Idazmahaiko Ingurunea aukeratzeko.</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: benetako Mageia sistema bat abiarazi dezakezu instalatu gabe,
-instalazioa egin ondoren zer egin ikusteko. Instalazio prozesua errazagoa
-da, baina aukera txikiagoak lortuko dituzu.</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Xehetasunak ematen dira hurrengo ataletan.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Baliabidea</title>
     <section>
       <title>Definizioa</title>
-      <para>Hemen, baliabide bat (plurala: baliabideak) da ISO fitxategi bat Mageia
-instalatzeko eta/edo eguneratzeko eta hedaduratik onartzen da ISO fitxategia
-kopiatzen den edozein fisiko sostengatzen du.</para>
-      <para>Aurki ditzakezu <link
-ns4:href="http://www.mageia.org/en/downloads/">hemen</link>.</para>
+      <para>Here, a medium (plural: media) is an ISO image file that allows you to
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
+      <para>You can find Mageia ISO's <link
+ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
     <section>
       <title>Instalazioa Klasiko baliabidea</title>
@@ -42,24 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">hemen</link>.</para>
         <title>Ezaugarri komunak</title>
         <itemizedlist>
           <listitem>
-            <para>ISO hauek DrakX deituriko Instalatzaile tradizionalak erabilitzen dituzte.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
-            <para>Eskuragarri dago instalazio garbi bat egitea edo berritzea aurreko bertsio
-batetatik.</para>
+            <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>32 edo 64 biteko arkitektura media ezberdinak.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Tresna batzuk Ongi etorri pantailan eskuragarri daude: Berreskuratze
-Sistema, Memoria Testa, Hardware hautemate tresna.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>DVD bakoitzak mahaigaineko ingurune eta hizkuntza asko dauka.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Instalazioan zehar software ez librea gehitzeko aukera izango duzue.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -70,22 +106,20 @@ Sistema, Memoria Testa, Hardware hautemate tresna.</para>
         <title>Ezaugarri komunak</title>
         <itemizedlist>
           <listitem>
-            <para>Distribuzioa aurreikusteko HDD baten instalatu gabe, eta aukeran Mageia zure
-HDD-an instalatzeko erabil daiteke.</para>
+            <para>Can be used to preview the Mageia operating system without having to install
+it</para>
           </listitem>
           <listitem>
-            <para>ISO bakoitzak mahaigain ingurune bakarra (Plasma, GNOME edo Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>32 edo 64 biteko arkitektura media ezberdinak.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOak instalazio garbiak sortzeko soilik
-erabiliko dira, ezin dira aurreko bertsioetatik eguneratzeko
-erabili.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Software ez librea dute.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -93,13 +127,13 @@ erabili.</emphasis></para>
         <title>Plasma Live DVDa</title>
         <itemizedlist>
           <listitem>
-            <para>Plasma mahaigain ingurunea soilik.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Hizkuntza guztiak presente daude.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit arkitektura soilik.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -107,13 +141,13 @@ erabili.</emphasis></para>
         <title>GNOME-ren Live DVD-a</title>
         <itemizedlist>
           <listitem>
-            <para>GNOME mahaigaineko ingurunea soilik.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Hizkuntza guztiak presente daude.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit arkitektura soilik</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -121,39 +155,27 @@ erabili.</emphasis></para>
         <title>Xfce Live DVDa</title>
         <itemizedlist>
           <listitem>
-            <para>Xfce mahaigain ingurunea soilik.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Hizkuntza guztiak presente daude.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 edo 64 bit arkitektura</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
     </section>
     <section>
-      <title>Abioko CD baliabidea soilik</title>
+      <title>Net install media</title>
       <section>
         <title>Ezaugarri komunak</title>
         <itemizedlist>
           <listitem>
-            <para>Bakoitza irudi txiki bat da eta hori drakx instalatzailea abiarazteko
-beharrezkoa dena baino ez dauke eta drakx-installer-Stage2 eta beharrezkoak
-diren beste pakete batzuk instalazioa jarraitu eta burutzeko. Pakete hauek
-PC disko gogorrean egon daiteke, tokiko drive baten, sare lokalean zein
-Interneten.</para>
-          </listitem>
-          <listitem>
-            <para>Media hauek oso arinak dira (100 MB baino gutxiago), eta komenigarria denean
-banda zabalera oso baxua denean DVD oso bat jaisteko, PC bat DVD unitate
-gabea edo USB batetik ezin abiarazi dezakeen PC bat.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>32 edo 64 biteko arkitektura media ezberdinak.</para>
-          </listitem>
-          <listitem>
-            <para>Ingelera hizkuntza soilik</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -161,8 +183,8 @@ gabea edo USB batetik ezin abiarazi dezakeen PC bat.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Software librea dauka soilik, software ez-librea erabiltzeari uko egiten
-dutenentzat.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -170,8 +192,7 @@ dutenentzat.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Software ez-librea (batez gidariak, kodek...) behar duten pertsonentzat
-dauzka.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -181,64 +202,89 @@ dauzka.</para>
     <title>Media Deskargatu eta Egiaztatzen</title>
     <section>
       <title>Deskargatzen</title>
-      <para>Behin zuk zure ISO fitxategia aukeratuta, deskargatu dezakezu http edo
-BitTorrent-a erabiliz. Bi kasuetan, leiho batek informazioren bat ematen
-dizu zuri, erbilitako ispilua adibidez eta banda-zabalera bada aldatzeko
-aukera baxu bada. Http aukeratzen baduzu, zuk onen antzeko zerbait ikusi
-ahal izango duzu</para>
+      <para>Once you have chosen your ISO file, you can download it using either http or
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum eta sha1sum ISOaren osotasuna egiaztatzeko tresnak dira. Erabili
-horietako bat bakarrik. Gorde bat <link linkend="integrity">geroago
-erabiltzeko</link>. Ondoren leiho hau agertuko da:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Egiaztatu Fitxategia Gorde botoia.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Deskargatutako baliabide osotasunaren egiaztapena</title>
-      <para>Checksum zenbaki biak deskargaturiko fitxategitik algoritmo batek
-kalkulatzen hamaseitarrak dira. Algoritmo hauei eskatzen diezunean zenbaki
-hau deskargatutako zure fitxategitik birkalkulatzeko, zenbaki bera duzu eta
-deskargatutako zure fitxategia zuzena da, edo zenbakia desberdina da eta
-porrota duzu. Porrot batek ondorioztatzen du deskarga birprobatu behar
-izango zenukeela edo konponketa bat egin BitTorrent erabiliz. </para>
-      <para>Ireki kontsola bat, ez da root izan beharrik, eta:</para>
-      <para>- md5sum erabiltzeko, idatzi: [sam@localhost]$ <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
-      <para>- sha1sum erabiltzeko, idatzi: [sam@localhost]$ <userinput>sha1sum
-path/to/the/image/file.iso</userinput>.</para>
-      <para>eta lortutako zenbakia zure ordenagailuan konparatu mageia emandako
-zenbakiarekin (pixka bat itxaron beharko duzu). Adibidea:</para>
+      <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
+      <para>To generate the checksum for your downloaded ISO, open a console, (no need
+to be root), and:</para>
+      <itemizedlist>
+        <listitem>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+        <listitem>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+      </itemizedlist>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para/>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Grabatu edo irauli ISOa</title>
-    <para>Hautatutako ISOa orain CD edo DVD batean erre daiteke edo USB baten
-irauli. Eragiketa hauek ez dira kopia sinple bat eta helburua abiatzeko gai
-den baliabide bat egitea da.</para>
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
     <section>
       <title>ISOa CD/DVDan grabatzen</title>
-      <para>Erabil ezazu nahiago duzun edozein erregailua baina ziurta ezazu grabatzeko
-gailuak ondo dagoela <emphasis role="bold">irudi bat grabatzeko</emphasis>,
-datuak edo fitxategiak erretzea ez da zuzena. Informazio gehiago dago <link
-ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">Mageia
-wikia</link>n.</para>
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
+ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
+wiki</link> for more information.</para>
     </section>
     <section>
       <title>Irauli ISOa USB baten</title>
-      <para>Mageia ISO guztiak hibridoak dira, horrek esan dezake horiekn USB baten
-"isuri" ditzakezula eta, ondoren, erabili sistema abiarazi eta instalatzeko.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>Irudi "isurketa" bat flash gailu baten gainean aldez aurreko partizio
-fitxategi-sistema suntsitzen du; edozein datu galduko dira eta partizio
-ahalmena irudiaren tamainara murriztuko da.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>Jatorrizko ahalmena berreskuratzeko, berriro formateatu eta zatitu behar
-duzu USB makila.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Tresna grafiko bat  erabiliz Mageia-ren barnean</title>
         <para><link
@@ -248,39 +294,51 @@ bezalako tresna grafiko bat erabil dezakezu</para>
       <section>
         <title>Tresna grafiko bat  erabiliz Windows-en barnean</title>
         <para>Zu saiatuko zinateke:</para>
-        <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> "ISO
-irudia" aukera erabiliz;</para>
-        <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
+        <itemizedlist>
+          <listitem>
+            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
+          </listitem>
+          <listitem>
+            <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
+Imager</link></para>
+          </listitem>
+        </itemizedlist>
       </section>
       <section>
-        <title>Komando lerroa erabiliz GNU/Linux sistema barnean</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
-          <para>potentzialki *arriskutsua* da hau eskuz egitea. Disko partizioa gainidatziz
-okerreko identifikatzailea lortzeko arriskua dago.</para>
+          <para>It is potentially *dangerous* to do this by hand. You risk overwriting
+potentially valuable existing data if you specify the wrong target device.</para>
         </warning>
-        <para>dd kontsola tresna bezala ere erabil dezakezu:</para>
         <orderedlist>
           <listitem>
             <para>Kontsola bat ireki</para>
           </listitem>
           <listitem>
-            <para>Bihurtu root komando <userinput> su - </userinput> (ez ahaztu finalean '-')</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Entxufatu zure USBa (ez muntatu, hau ere esan dezake edozein aplikazio edo
-fitxategi kudeatzaile ez ireki  hori eskuratu eta irakurri, ezin)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Idatzi <userinput>fdisk-l</userinput> komandoa</para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
-            <para>Bestela, gailuaren izena lor dezakezu <code>dmesg</code> komandoarekin:
-amaieran, gailuaren izena <emphasis>sd</emphasis> hasita ikusiko duzu, eta
-<emphasis>sdd</emphasis> honetan kasu:</para>
-            <screen>[72594.604531] usb 1-1-a: 27 zenbakia xhci_hcd erabiliz abiadura handiko USB-tresna berria
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
+          </listitem>
+          <listitem>
+            <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+            <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
+            <para><screen>[72594.604531] usb 1-1-a: 27 zenbakia xhci_hcd erabiliz abiadura handiko USB-tresna berria
 [72594.770528] usb 1-1-a: Aurkitutako USB-tresna berria, idVendor=8564, idProduktua=1000
 [72594.770533] usb 1-1-a: USB-etako tresnako kate berriak: Mfr=1, Product=2, SerieZenbakia=3
 [72594.770536] usb 1-1-a: Produktua: Gailu biltegiratze masiboa
@@ -297,24 +355,28 @@ amaieran, gailuaren izena <emphasis>sd</emphasis> hasita ikusiko duzu, eta
 [72595.965025] sd 8:0:0:0-a: [sdd-a] Cache found modu|moda-orri bat ere
 [72595.965031] sd 8:0:0:0-a: [sdd-a] Uste Izan|Hartu bidaia|bultzada-cachea: idatz ezazu through
 [72595.967251] sdd-a: sdd1
-[72595.969446] sd 8:0:0:0-a: [sdd-a] Attached SCSI-ren desmuntagarri|ateratzeko moduko diskoa</screen>
-          </listitem>
-          <listitem>
-            <para>Aurkitu zure USB gailuaren izena (bere tamainaren arabera), adibidez
-<code>/dev/sdb</code> goiko irudian, 8GB USB-makila.</para>
+[72595.969446] sd 8:0:0:0-a: [sdd-a] Attached SCSI-ren desmuntagarri|ateratzeko moduko diskoa</screen></para>
           </listitem>
           <listitem>
-            <para>Agindua sartu: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX
-bs=1M</userinput></para>
-            <para>Non X=zure dispositiboaren izena adibidez: /dev/sdc</para>
-            <para>Adibidea: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
-of=/dev/sdb bs=1M</userinput></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
+            <tip>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
+            </tip>
           </listitem>
           <listitem>
-            <para>Agindua sartu: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
-            <para>Deskonektatu zure USB, eginda dago</para>
+            <para>This is the end of the process, and you may now unplug your USB stick.</para>
           </listitem>
         </orderedlist>
       </section>
diff --git a/docs/docs/stable/installer/eu/acceptLicense.xml b/docs/docs/stable/installer/eu/acceptLicense.xml
index 292e4006..60d97749 100644
--- a/docs/docs/stable/installer/eu/acceptLicense.xml
+++ b/docs/docs/stable/installer/eu/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,33 +37,44 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Lizentzia eta Askatze Oharrak</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
-revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
-</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
-revision="5" align="center" condition="live" format="PNG"
-fileref="live-license.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="acceptLicense-im1" fileref="dx2-license.png" align="center"
+revision="4"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-license.png" xml:id="acceptLicense-im2" revision="5"
+align="center" condition="live"/> </imageobject></mediaobject>
 
   <section xml:id="license">
     <info>
       <title xml:id="license-ti1">Lizentzia Kontratua</title>
     </info>
 
-    <para><application>Mageia</application> instalatu aurretik, irakurri arretaz
-baldintzak eta lizentzia.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Baldintza horiek <application>Mageia</application> distribuzio osoaari
-aplikatzen dira eta jarraitzeko onartu behar dituzu.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Onartzeko, hautatu <guilabel>Ados</guilabel> eta egin klik
-<guibutton>Hurrengo</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Aukeratu baduzu baldintza hauek ez onestea, irakurri duzula ere baloratuko
-dugu. <guibutton>Irten</guibutton> Klik eginda zure ordenagailua
-berrabiaraziko da.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -75,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Informazio garrantzitsua <application>Mageia</application> oharra honi buruz
-ematen da eta <guibutton>argitalpen oharrak</guibutton> botoian klik eginez
-daude eskuragarri.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/addUser.xml b/docs/docs/stable/installer/eu/addUser.xml
index 9e924da1..72d76741 100644
--- a/docs/docs/stable/installer/eu/addUser.xml
+++ b/docs/docs/stable/installer/eu/addUser.xml
@@ -1,111 +1,134 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="eu" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Erabiltzaile eta Supererabiltzaileen Kudeaketa</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
+
   
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Ezarri administratzaile (root) pasahitza:</title>
     </info>
-    <para>Administratzaile / supererabiltzaile pasahitz bat konfiguratzea
-gomendagarria da, Linux-en <emphasis>root pasahitz</emphasis> bezala
-ezagutzen den <application>Mageia</application> instalazio guztietarako
-. Pasahitz bat idazten duzun bitartean koadroan kolorez  gorritik horira eta
-berderaino pasahitzaren segurtasun mailaren arabera aldatuko den armarria
-agertuko da. Ezkutu berde bat erakusten segurtasun maila altua. Beheko
-koadroan errepikatu behar duzu, lehengo pasahitzean akatsik ez duzula egin
-egiaztatzeko.</para>
+
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
+
     <note xml:id="givePassword">
-      <para>Pasahitz guztiak kasu sentikorrak dira, onena da letrak (maiuskulak eta
-minuskulak), zenbakiak eta bestelako karaktereak nahastea pasahitz batean.</para>
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
+
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Sartu erabiltzaile bat</title>
     </info>
-    <para>Hemen erabiltzaile bat gehi daiteke. Erabiltzaile batek administratzaileak
-baino baimen gutxiago ditu, baina nahikoak Interneten nabigatzeko, aplikazio
-ofimatikoak erabiltzeko, jokatzeko eta erabiltzaile ertainak bere
-ordenagailuarekin edozer egiteko.</para>
+
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
+
     <itemizedlist>
       <listitem>
-        <para><guibutton>Ikonoa</guibutton>: botoi honetan klik egiten baduzu,
-erabiltzaile ikonoa aldatu egingo da.</para>
+        <para><emphasis role="bold">Icon</emphasis></para>
+
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Benetako Izena</guilabel>:  Erabiltzaileen benetako izena sartu
-ezazu testu-kutxa honetan.</para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Saio Hasiera Izena</guilabel>: Erabiltzailearen saio-hasierako
-izena hemen sartzen da edo drakx bertsioari uzten diozu erabiltzaileen
-benetako izena erabiltzen.<emphasis> Saio-hasiera-izena maiuskula eta
-minuskulei sentibera da.</emphasis></para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Pasahitza</guilabel>: Testu-kutxa honetan erabiltzaile-pasahitza
-idatzi behar izango zenuke. Ezkutu bat agertzen da pasahitzaren indarra
-adierazteko testu-kutxaren bukaeran. (Ikusi ezazu ere  <xref
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
 linkend="givePassword"/>)</para>
-      </listitem>
-      <listitem>
-        <para><guilabel>Pasahitza (berriz)</guilabel>: Erabiltzaile-pasahitza berridatziko
-duzu kutxa honetan eta drakx-ak begiratuko du testua, erabiltzailearen
-pasahitzeko testuko kutxetako bakoitzean pasahitz bera duzula.</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
+
     <note>
-      <para>Mageia instalatzen duzun bitartean gehitutako edozein erabiltzaile, bai
-irakur eta idazteko babestutako etxe direktorioa izango du (umask=0027).</para>
-      <para>Behar diren gehigarri guztiak gehitu ditzakezu <emphasis>Ezarpen -
-Laburpen</emphasis>step during the install. Aukeratu
-<emphasis>Erabiltzaileak kudeatu</emphasis>.</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
+
+      <para>You can add any extra needed users in the <emphasis>Configuration -
+Summary</emphasis> step during the install. Choose <emphasis>User
+management</emphasis>.</para>
+
       <para>Sarbide baimena instalatu ondoren ere aldatu egin daiteke.</para>
     </note>
   </section>
-  <section xml:id="addUserAdvanced" condition="classical">
+
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Erabiltzailearen Kudeaketa Aurreratua</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
-    <para>Botoi <guibutton>aurreratua</guibutton> sakatzen bada konfigurazioa gehitzen
-duen erabiltzailearentzat editatzea baimentzen dion pantaila eskaintzen
-zaio.</para>
-    <para condition="classical">Gainera, baliogabetu edo gaitu ahal izango duzu gonbidatu kontu bat.</para>
-    <warning condition="classical">
-      <para>gonbidatu erabiltzaile batek gordetako edozer
-gauza(<emphasis>rbash</emphasis>rekin) zure karpeta nagusitik ezabatu egingo
-da saioa amaitzean. Gonbidatuak bere fitxategi garrantzitsuak USB disko
-baten gorde behar ditu.</para>
-    </warning>
+
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
+
     <itemizedlist>
-      <listitem condition="classical">
-        <para><guilabel>Gaitu gonbidatu kontua </guilabel>: Hemen gonbidatu kontu bat
-gaitu edo desgaitu dezakezu. Gonbidatu kontua gonbidatu bati PC-an sartu eta
-erabiltzeko aukera ematen du, baina erabiltzaile sarrera normala baino
-murritzagoak izaten dira.</para>
-      </listitem>
       <listitem>
-        <para><guilabel>Shell</guilabel>: Beherapen hori zerrendan behera ematen dio
-erabiltzaileari aurreko pantailara ere gehitzen ari zaren erabilitako
-shell-a aldatzeko aukera, aukerak dira Bash, Dash eta Sh</para>
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Erabiltzaile ID</guilabel>: ID erabiltzailea hemen jar diezaiokezu
-aurreko pantailan gehitu duzun erabiltzaileari. Hau zenbaki bat da. Hutsik
-utzi ezazu ez badakizu zer egiten ari zaren.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Talde ID</guilabel>: Honek uzten zaitu talde ID sorta, zenbaki
-bat, normalean erabiltzaileari dagokion berdina. Hutsik utzi ezazu ez
-badakizu zer egiten ari zaren.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eu/add_supplemental_media.xml b/docs/docs/stable/installer/eu/add_supplemental_media.xml
index 12702afa..4deb2cae 100644
--- a/docs/docs/stable/installer/eu/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/eu/add_supplemental_media.xml
@@ -1,54 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" xml:id="add_supplemental_media"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="eu">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Baliabide Aukeraketa (Konfiguratu Instalazio Baliabide Osagarriak)</title>
-    </info>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
+  </info>
 
   
+
+  
+
+  
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
-<imageobject> <imagedata align="center"
-fileref="dx2-add_supplemental_media.png" format="PNG" revision="1"
-xml:id="dx2-add_supplemental_media-im1"/> </imageobject></mediaobject>
-
-  <para>Pantaila honek dagoeneko aitortutako biltegi zerrenda erakusten du. Pakete
-iturri batzuk gehi ditzakezu disko optikoa edo urrutiko iturri
-gisa. Hurrengo urratsetan zer pakete aukeratu ahal izago den hautatutako
-iturriek zehazten dute.</para>
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
+<imageobject> <imagedata format="PNG"
+fileref="dx2-add_supplemental_media.png"
+xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Sare iturri batentzat, bi pausu jarraitu beharko ditugu:</para>
 
   <orderedlist>
     <listitem>
-      <para>Sarea aukeratzea eta aktibatzea, dagoeneko ez baldin badago. </para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
-      <para>Aukeratu ispilu bat, edo URL bat (lehen sarrera) zehaztu. Noiz ispilu
-zerbitzari bat hautatuta mageia biltegi administratze guztien aukeraketa
-sarbidea, hala nola nonfree, kutsatu eta eguneraketa biltegiak bezala. URL
-batekin, biltegi-zehatzak edo zure NFS instalazioa izenda dezakezu.</para>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
-    <note>
-      <para>64 biteko instalazio bat eguneratzen ari bazara 32 biteko pakete batzuk izan
-ditzake, pantaila hau erabiltzea gomendatzen da online ispilu bat gehitzeko,
-hemengo Sare protokoloak bat markatuz. 64 biteko DVD ISOak 64 bit eta noarch
-paketeak soilik dauzka, ezin izango da 32 biteko paketerik eguneratzea. Hala
-eta guztiz ere, online ispilu bat gehitu ondoren, instalatzaileak beharrezko
-32 biteko paketeak han topatuko ditu.</para>
-     </note>
-
-</section>
+  <note>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/ask_mntpoint_s.xml b/docs/docs/stable/installer/eu/ask_mntpoint_s.xml
index 8909c9c1..8731a35d 100644
--- a/docs/docs/stable/installer/eu/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/eu/ask_mntpoint_s.xml
@@ -1,27 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="ask_mntpoint_s" version="5.0" xml:lang="eu">
-
+<section version="5.0" xml:lang="eu" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Aukeratu muntatze-puntuak</title>
   </info>
 
   
+
   
+
   
+
   
+
+  
+
+  
+
   
+
   
+
   
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -33,58 +44,55 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
-xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-chooseMountpoints.png" align="center" format="PNG"
-xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
-
-  <para>Hemen ordenagailuan aurkitutako Linux partizioak ikusi ahal izango
-dituzu. Gomendioarekin ados ez bazaude <application>DrakX</application>,
-muntatze puntu alda ditzake.</para>
-
-  <note>
-    <para>Edozer aldatzen baduzu, ziurtatu oraindik <literal>/</literal> (root)
-partizioa duzual.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
 
-  <itemizedlist>
-    <listitem>
-      <para>Partizio bakoitza honela erakutsiko da: "Gailua" ("Tamaina", "Muntatze
-puntua", "Mota").</para>
-    </listitem>
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
+  <itemizedlist>
     <listitem>
-      <para>"Gailua", honako hauek osatzen dute: "disko", ["Disko gogor zenbakia"
-(letra)], "partizio-zenbakia" (adibidez, "sda5").</para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
-    
     <listitem>
-      <para>Partizio batzuk badituzu, muntai puntu ezberdinak aukera ditzakezu zerrenda
-zabaltzen, <literal>/</literal>, <literal>/home</literal> eta
-<literal>/var</literal> bezalakoak. Zure muntatze puntuak ere egin
-ditzakezu, adibidez <literal>/video</literal> zure pelikulak gordetzeko
-partizio bezala, edo <literal>/cauldron-home</literal>
-<literal>/home</literal> Cauldron instalazioko home partiziorako.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
-      <para>Zuk sartu behar ez duzun partizioen, muntaketa puntuaren eremua hutsik utzi
-dezakezu.</para>
+      <para>For any partitions that you don't need to make use of, you can leave the
+mount point field blank.</para>
     </listitem>
   </itemizedlist>
 
   <warning>
-    <para>Aukeratu <guibutton>Aurrekoa</guibutton> zein aukeratu seguru ez bazau, eta
-ondoren markatu <guilabel>Partizio pertsonalizatua</guilabel>. Hurrengo
-pantailan, partizio batean klik egin dezakezu bere tamaina eta mota
-ikusteko.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Muntatze puntu zuzenak direla ziur bazaude, egin klik
-<guibutton>Hurrengoa</guibutton>, eta aukeratu formatua eman edo DrakX
-iradokitutako partizioa(k) gobernatu soilik edo baita batzuk gehiago nahi
-dituzun.</para>
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
 </section>
diff --git a/docs/docs/stable/installer/eu/bestTime.xml b/docs/docs/stable/installer/eu/bestTime.xml
index 46061562..2b052f32 100644
--- a/docs/docs/stable/installer/eu/bestTime.xml
+++ b/docs/docs/stable/installer/eu/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="eu" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Erlojuaren ezarpenak</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>Urrats honetan, zein ordutan dagoen zure barneko erloju ezarrita hautatu
-behar duzu, bai tokiko ordua edo UTC denbora.</para>
-
-  <para>Fitxa aurreratuan, erloju ezarpenei buruzko aukera gehiago aurkituko duzu.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/bootLive.xml b/docs/docs/stable/installer/eu/bootLive.xml
index 563ae642..5646d9f2 100644
--- a/docs/docs/stable/installer/eu/bootLive.xml
+++ b/docs/docs/stable/installer/eu/bootLive.xml
@@ -1,30 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="eu"><info><title xml:id="bootLive-ti1">Abiatu Mageia Zuzeneko sistema bezala</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Euskarria abiarazten</title></info><section><info><title xml:id="bootLive11-ti1">Diskotik</title></info><para>Zuzenean abiarazi dezakezu irudia erre duzun (CD-ROM, DVD-ROM ...)
-baliabidetik. Normalean zure CD/DVD unitatean txertatzea besterik ez da
-behar instalazioa automatikoki abiarazteko ordenagailua berrabiarazi
-ondoren. Hori gertatzen ez bada BIOS-a konfiguratu beharko zenuke edo
-zeinetatik ordenagailua martxan jarriko den periferikoa aukeratzea eskainiko
-zaituen tekla bati zapaldu.</para><para>Hardwarea eta konfiguratuta arabera nola dagoen, hurrengo bat edo bi
-pantailetako beste bat lortzen da.</para></section><section><info><title xml:id="bootLive12-ti1">USB gailu batetik</title></info><para>Zure irudia ISO irauli duzun USB gailu horretatik abia dezakezu. Zure BIOS
-ezarpenen arabera, abiarazketa agian zuzenean USB gailua dagoeneko portu
-batean sartuta dagoela. Hori gertatzen ez bada BIOS-a konfiguratu beharko
-zenuke edo zeinetatik ordenagailua martxan jarriko den periferikoa
-aukeratzea eskainiko zaituen tekla bati zapaldu.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">BIOS/CSM/Legacy moduan</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Lehen pantaila BIOS moduan abiarazten den bitartean</para></caption></mediaobject><para>Erdiko menuan, hiru ekintzen artean erabaki behar duzu:</para><itemizedlist><listitem><para>Mageia Abiarazi: Horrek 5 Mageia konektatutako baliabidetik hasiko dela esan
-nahi du (CD / DVDa edo USB memoria) diskoan ezer idatzi gabe , beraz,
-sistema oso geldoa espero da. Behin abiatuta, instalazioa jarrai dezakezu
-disko gogor batean.</para></listitem><listitem><para>Mageia Instalatu: aukera hau zuzenean instalatu egingo da Mageia disko
-gogorrean.</para></listitem><listitem><para>Disko gogorretik abiarazi: aukera honek aukera ematen du disko gogorretik
-abiarazteko, ohikoa den bezala, (CD/DVD edo USB) baliabidea konektatuta ez
-dagoenean. (Mageia 5-ean ez du funtzionatzen).</para></listitem></itemizedlist><para>Menuaren azpikaldean, Abio Aukerak daude:</para><itemizedlist><listitem><para>F1 - Laguntza. Azaldu aukerak "splash", "APM", "acpi" eta "Ide"</para></listitem><listitem><para>F2 - Hizkuntza. Aukeratu pantailen hizkuntza.</para></listitem><listitem><para>F3 - Pantailaren bereizmena. Aukeratu testua, 640x400, 800x600, 1024x728
-artean</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom edo besteak. Normalean, instalazioa txertatuko
-instalazio euskarri batetik egiten da. Hemen, hautatu beste iturri bat, FTP
-edo NFS zerbitzariak bezalakoa. Instalazioa zabaltzen baditu SLP zerbitzari
-batekin sare batean, hautatu instalazio iturria aukera honekin zerbitzarian
-eskuragarri.</para></listitem><listitem><para>F5 - Driver. Bai edo Ez. Sistemak disko optikoak ontrolatzailea
-eguneraketarik duen jakitun da eta instalazio prozesuan zehar txertatzeko
-eskatzen du.</para></listitem><listitem><para>F6 - Kernel aukera. Hau zure hardware eta gidarien erabileraren araberako
-aukerak zehazteko modu bat da.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">UEFI moduan</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Lehen pantaila diskotik UEFI sistema abiaraztean</para></caption></mediaobject><para>Aukera bakarra duzu Mageia Live moduan exekutatzeko (lehenengo aukera) edo
-instalazioa prozesatzeko (bigarren aukera).</para><para>USB batetik abiarazi baduzu, hau da, aurreko lerroetako kopia bat bi lerro
-osagarrirekin lortzen dira "USB" atzizkiarekin. Haiek aukeratu behar dituzu.</para><para>Kasu bakoitzean, lehen urrats bera aukeratu hizkuntza, ordu-eremua
-eta teklatua, ondoren, prozesu ezberina da, <link linkend="testing">Live
-moduan urrats osagarriekin</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Abiatu Mageia Zuzeneko sistema bezala</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Euskarria abiarazten</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">BIOS/CSM/Legacy moduan</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Lehen pantaila BIOS moduan abiarazten den bitartean</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">UEFI moduan</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/eu/chooseDesktop.xml b/docs/docs/stable/installer/eu/chooseDesktop.xml
index 0d391d61..0c1123dd 100644
--- a/docs/docs/stable/installer/eu/chooseDesktop.xml
+++ b/docs/docs/stable/installer/eu/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Idaztegi hautaketa</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Idaztegi hautaketa</title>
   </info>
 
   
 
-  <para>Zure hautapena arabera hemen, pantaila gehiago eskaini ahal izango duzu zure
-aukera doitzeko.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>Aukeraketa pusuen ondoren, paketeen instalazioan zehar aurkezpen bat ikusiko
-duzu. Aurkezpen hau <guilabel>Xehetasunak</guilabel> sakatuz desaktiba
-daiteke.</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Nahiago duzun idazmahaiko ingurunea, <application>KDE</application> edo
-<application>Gnome</application> aukera itzazu. Biek aplikazio erabilgarri
-eta tresna joko osoa dute. Pertsonalizatuta marka ezazu haietako bat edo
-biak erabili nahi ez badituzu, edo lehenetsi idazmahai ingurune bakoitzerako
-aukeratutako softwarea baino gehiago nahi
-baduzu. <application>LXDE</application> idazmahaia, gutxiago deitzen duen
-itxurakoa eta lehenetsi instalatutako pakete gutxiagorekin, aurreko beste
-biak baino arinagoa da.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/eu/choosePackageGroups.xml b/docs/docs/stable/installer/eu/choosePackageGroups.xml
index 1d8c5ad0..cf6d95da 100644
--- a/docs/docs/stable/installer/eu/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/eu/choosePackageGroups.xml
@@ -1,39 +1,42 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Pakete-taldearen hautapena</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
-  <para>Paketeak batera jarri dira zure beharren araberako aukeraketa asko
-errazteko. Taldeak intuizioz definitzen dira. Hala ere, informazio gehiago
-behar baduzu, besterik gabe, haiei buruzko informazio gehiago bistaratzen da
-talde bakoitzaren gainetik sagua pasatzean.</para>
+  <para>Packages are arranged into common groups, to make choosing what you need on
+your system a lot easier. The groups are fairly self explanatory, however
+more information about the content of each is available in tool-tips which
+become visible as the mouse is hovered over them.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Lanpostua.</para>
+      <para><emphasis role="bold">Workstation</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Zerbitzaria.</para>
+      <para><emphasis role="bold">Server</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Ingurumen Grafikoa.</para>
+      <para><emphasis role="bold">Graphical Environment</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Banakako Pakete Hautaketa: Aukera hau erabili ahal izango duzu eskuz gehitu
-edo kentzeko paketeak.</para>
+      <para><emphasis role="bold">Individual Package Selection</emphasis>: you can use
+this option to manually add or remove packages</para>
     </listitem>
   </itemizedlist>
 
-  <para>Irakur <xref linkend="minimal-install"/> instalazio minimo bat egiteko
-argibideak (X &amp; IceWM -ekin edo gabe).</para>
+  <para>See <xref linkend="minimal-install"/> for instructions on how to do a
+minimal install (without or with X &amp; IceWM).</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/choosePackagesTree.xml b/docs/docs/stable/installer/eu/choosePackagesTree.xml
index cbca01ac..cf0d72f2 100644
--- a/docs/docs/stable/installer/eu/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/eu/choosePackagesTree.xml
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="choosePackagesTree">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="eu">
+  <info>
+    <title xml:id="choosePackagesTree-ti1">Aukeratu Banakako Paketeak</title>
+  </info>
 
-    <info>
-      <title xml:id="choosePackagesTree-ti1">Aukeratu Banakako Paketeak</title>
-    </info>
+  
 
-    
+  
 
-<mediaobject>
-<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
-<imageobject> <imagedata fileref="dx2-choosePackagesTree.png" align="center"
-format="PNG" ></imagedata> </imageobject></mediaobject>
+  
 
-    <para>Hemen edozein extra pakete gehitu edo kendu dezakezu zure instalazioa
-pertsonalizatzeko.</para>
+  <mediaobject>
+<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
+align="center"/> </imageobject></mediaobject>
 
-    <para>Aukeratu ondoren, orrialde amaierako <guibutton>diskete ikono</guibutton>an
-klikatu dezakezu zure pakete aukera gordetzeko (baita USB unitate batean
-gorde ditzake). Artxibo hau erabil dezakezu beste sistema batean pakete
-berak instalatzeko, kargatzeko instalazioan zehar botoi bera sakatuz.</para>
-  </section>
+  <para>Here you can add or remove any extra packages to customize your
+installation.</para>
 
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/configureServices.xml b/docs/docs/stable/installer/eu/configureServices.xml
index 3a0d028b..bcd9651b 100644
--- a/docs/docs/stable/installer/eu/configureServices.xml
+++ b/docs/docs/stable/installer/eu/configureServices.xml
@@ -1,40 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="configureServices" version="5.0" xml:lang="eu">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="eu" xml:id="configureServices">
+  <info>
+    <title xml:id="configureServices-ti1">Konfiguratu zure Zerbitzuak</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="configureServices-ti1">Konfiguratu zure Zerbitzuak</title>
-    </info>
+  
 
-    
-   
+  
 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureServices.png"
-align="center" format="PNG" xml:id="configureServices-im1"></imagedata>
-</imageobject></mediaobject>
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
+xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
+  <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-    <para revision="1" xml:id="configureServices-pa1">Hona hemen zein zerbitzu (ez) duten hasi behar zure sistema abiarazterakoan
-ezar dezakezu.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-    <para revision="1" xml:id="configureServices-pa2">Badira lau talde, sakatu talde bateko aurreko triangeluan zabaltzeko eta
-zerbitzuak ikusteko.</para>
-
-    <para revision="1" xml:id="configureServices-pa3">Aukeratutako DrakX ezarpenak onak izaten dira.</para>
-
-    <para revision="1" xml:id="configureServices-pa4">Zerbitzu bat nabarmendu baduzu, hari buruzko informazioa beheko info
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Zerbitzu bat nabarmendu baduzu, hari buruzko informazioa beheko info
 koadroan erakusten da.</para>
+    </listitem>
+  </itemizedlist>
 
-    <para revision="1" xml:id="configureServices-pa5">Gauza bakarra aldatzen duzunean, oso ondo dakizu zer egiten ari zaren.</para>
-  </section>
-
+  <para xml:id="configureServices-pa5" revision="1">Gauza bakarra aldatzen duzunean, oso ondo dakizu zer egiten ari zaren.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/configureTimezoneUTC.xml b/docs/docs/stable/installer/eu/configureTimezoneUTC.xml
index f913733f..eefaa31a 100644
--- a/docs/docs/stable/installer/eu/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/eu/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="configureTimezoneUTC">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="eu">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Konfiguratu zure Denbora-Eremua</title>
   </info>
@@ -7,20 +7,30 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject condition="classical"> <imagedata
-xml:id="configureTimezoneUTC-im1" revision="1"
-fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
-</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
-condition="live" format="PNG"/> </imageobject></mediaobject>
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="configureTimezoneUTC-im1" align="center"
+fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa1">Aukera ezazu zure ordu-eremua zure herrialdea edo hiri bat behar duzu ordu
-zona berekoa aukeratuz.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa2">Hurrengo pantailan zure hardware erlojua tokiko ordu edo GMT, UTC gisa
-ezagutzen dena ezartzeko aukera daukazu.</para>
+  <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
+or to GMT, also known as UTC.</para>
 
   <note>
     <para revision="1" xml:id="configureTimezoneUTC-pa3">Ordenagailuan sistema eragileren bat baino gehiago baduzu, ziurtatu guztiak
diff --git a/docs/docs/stable/installer/eu/configureX_card_list.xml b/docs/docs/stable/installer/eu/configureX_card_list.xml
index a4edd74b..42ba318e 100644
--- a/docs/docs/stable/installer/eu/configureX_card_list.xml
+++ b/docs/docs/stable/installer/eu/configureX_card_list.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="configureX_card_list">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
@@ -6,20 +13,28 @@
   
 
   
+
+  
+
+  
+
   
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Aukeratu X zerbitzari bat (Konfiguratu Txartel Grafikoa)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-xml:id="configureX_card_list-im1" fileref="dx2-configureX_card_list.png"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX bideo txartelen datu-base osoa dauka, eta normaleanzure bideo gailua
 behar bezala identifikatuko du.</para>
@@ -27,35 +42,34 @@ behar bezala identifikatuko du.</para>
   <para>Instalatzaileak ez du behar bezala zure txartel grafikoa detektatu, eta zein
 duzun baldin badakizu, hautatu ahal izango duzu zuhaitzean: <itemizedlist>
       <listitem>
-        <para>hornitzailea</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>ondoren zure txartela izena</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>eta txartel mota</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
-  <para>Zure txartela ezin baduzu fabrikatzaile zerrendan aurkitu (oraindik
-datu-basean ez delako sartu edo txartela zaharra delako) kontrolatzaile
-egokia aurki dezakezu Xorg-en kategorian.</para>
-
-  <para>Xorg-eko zerrendak generiko eta kode irekiko 40 kontrolatzaile baino gehiago
-hornitzen ditu bideo-txartelerako. Oraindik zure txartelerako kontrolatzaile
-egokia ez baduzu aurkitu, vesa kontrolatzailea erabiltzeko aukera
-duzu. Kontrolatzaile honek zure bideo-txartelerako oinarrizko ahalmena
-hornitzen du.</para>
-
-  <para>Kontutan izan bateraezina kontrolatzaile bat hautatzen baduzu Aginte
-Interfazerako sarbidea soilik izan dezakezula.</para>
+  <para>If you cannot find your card in the vendor lists (because it's not yet in
+the database or it's an older card) you may find a suitable driver in the
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Bideo-txartel fabrikatzaile batzuek Nonfree biltegietan soilik aurkitzen
-diren jabedun kontrolatzaileak hornitzen dituzte Linux-erako. Kasu
-batzuetan, fabrikatzailearen webgunean aurkitzen dira soilik.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
-  <para>Nonfree biltegia esplizituki gaituta egon behar da sartzeko. Ez baduzu hura
-aurretik hautatu, hau egin beharko duzu berrabiarazi ondoren lehenengoz.</para>
-</section>
\ No newline at end of file
+  <para>Some video card manufacturers provide proprietary drivers for Linux which
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/eu/configureX_chooser.xml b/docs/docs/stable/installer/eu/configureX_chooser.xml
index 96713282..c4799d65 100644
--- a/docs/docs/stable/installer/eu/configureX_chooser.xml
+++ b/docs/docs/stable/installer/eu/configureX_chooser.xml
@@ -1,64 +1,92 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="eu">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Txartel Grafikoa eta Pantaila Konfigurazioa</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata revision="1" fileref="dx2-configureX_chooser.png"
-align="center" format="PNG" xml:id="configureX_chooser-im1"> </imagedata>
-</imageobject></mediaobject>
-
-  <para revision="1" xml:id="configureX_chooser-pa1">Zuk Mageia-ren instalazio honetarako aukeratu duzun ingurune grafikoarekiko
-(idazmahai-ingurune bezala ere ezagututa) independenteki, guztiak
-erabiltzaile interfaze-sistema grafikoan oinarrituta daude<acronym>X Window
-Sistema</acronym> , edo  <acronym>X</acronym> soilik deitutakoa. Horrela,
-<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym>
-edo beste edozein ingurune grafiko ondo funtzionatzeko,
-<acronym>X</acronym>-en hurrengo ezarpena egokia izan behar da. Aukeratu
-ezarpen egokia <application>DrakX</application>-ek ez duela ezer aukeratzen
-edo ez duela egoki aukeratu ikusten baduzu.</para>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
+
+  <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis><guibutton>Txartel Grafikoa</guibutton></emphasis>: Aukeratu zure
-txartela zerrendatik behar izanez gero.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis><guibutton>Pantaila</guibutton></emphasis>: Aukera dezakezu
-<guilabel>Plug'n Play</guilabel> posible denean, edo
-<guilabel>Hornitzaile</guilabel> edo <guilabel>Generiko</guilabel>
-zerrendako zure pantaila aukeratu. Aukeratu
-<guilabel>pertsonalizatua</guilabel> pantailaren freskatze horizontaleko eta
-bertikaleko tasak eskuz jartzea nahiago baduzu.</para>
-
-      <warning>
-        <para revision="1" xml:id="configureX_chooser-pa3a">Freskatze tasa okerra zure pantaila kaltetu dezake</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis><guibutton>Bereizmena</guibutton></emphasis>: Hemen pantailan
-ezarri nahi den ebazpen eta kolore sakonera.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis><guibutton>Froga</guibutton></emphasis>: Froga botoia ez da beti
-agertzen instalazioan zehar. Botoia baldin badago, bere ezarpenak kontrola
-ditzakezu hura sakatzen. Ezarpena egokia den galdera agertzen bada, "bai"
-erantzun dezakezu, eta ezarpenak gordeko dira. Ezer ikusten ez baduzu,
-ezarpenetako pantailara itzuli eta dena berriz konfiguratu ahal izango duzu
-proba baliozkoa izan arte. <emphasis>Ziurta ezazu konfigurazioa toki
-seguruan dagoela froga botoia eskuragarri ez badago</emphasis>.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis><guibutton>Aukerak</guibutton></emphasis>: Hemen hainbat aukera
-aktibatzeko edo desaktibatzeko aukera dezakezu.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
 </section>
diff --git a/docs/docs/stable/installer/eu/configureX_monitor.xml b/docs/docs/stable/installer/eu/configureX_monitor.xml
index 4ff9da4c..3f3a45aa 100644
--- a/docs/docs/stable/installer/eu/configureX_monitor.xml
+++ b/docs/docs/stable/installer/eu/configureX_monitor.xml
@@ -14,11 +14,17 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
-<!-- lproof -->
+<!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Aukeratu zure Pantaila</title>
   </info>
 
@@ -26,58 +32,73 @@
 identifika dezake.</para>
 
   <warning>
-    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis>Pantaila ezaugarri ezberdinak dituen bat aukeratzea zure pantaila
-edo bideo osagaiak kaltetu dezakete. Mesedez, ez zaitez saiatu ezer egiten
-zer egiten duzun jakin gabe.</emphasis> Zalantzarik izanez gero, kontsultatu
-zure pantailaren dokumentazioa.</para>
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
+could damage your monitor or video hardware. Please don't try something
+without knowing what you are doing.</emphasis> If in doubt you should
+consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
 format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa2"><emphasis>Pertsonalizatua</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Aukera horrek bi parametro kritiko, freskatze maiztasun bertikala eta
-sinkronismo horizontala aldatzea uzten du. Freskatze maiztasun bertikala
-nola freskatuko den pantailan askotan zehazten du, eta sinkronismo
-horizontal tasa zein lerro ikus daitezke.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4"><emphasis> GARRANTZITSUA </emphasis> da ez aukeratzea pantaila mota bat zure
+        <para revision="1" xml:id="configureX_monitor-pa4"><emphasis> GARRANTZITSUA </emphasis> da ez aukeratzea pantaila mota bat zure
 benetako panatilaren freskatze tasa baino haundiagoa duenik, kaltetu
 baitezake. Zalantzarik izanez gero, ezarpen kontserbadore bat aukeratu eta
 ikusi zure pantailaren dokumentazioa.</para>
+      </listitem>
+    </varlistentry>
 
-  <para revision="1" xml:id="configureX_monitor-pa5"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para revision="1" xml:id="configureX_monitor-pa6">Hau da aukera lehenetsia eta pantaila pantailaren mota datu-basetik zehazten
-saiatzen da.</para>
-
-  <para revision="1"
-  xml:id="configureX_monitor-pa7"><emphasis>Hornitzailea</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa8">Instalatzaileak ez du behar bezala zure pantaila detektatu, eta zein duzun
-baldin badakizu, hautatu ahal izango duzu hautaketa zuhaitzean: <itemizedlist>
       <listitem>
-        <para>hornitzailea</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>pantailaren fabrikatzailearen izena</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>pantailaren deskribapena</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Instalatzaileak ez du behar bezala zure pantaila detektatu, eta zein duzun
+baldin badakizu, hautatu ahal izango duzu hautaketa zuhaitzean:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa9"><emphasis>Generikoa</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para revision="1" xml:id="configureX_monitor-pa10">hautatu 30 talde inguruko pantaila ezarpenak 1024x768 @ 60Hz pantaila lauak
-eta eramangarriak bezalakoak erabiltzen dira. Hau da, askotan pantaila
-aukeraketa talde on bat da Vesa kontrolatzile txartela erabili behar den
-bideo txartelr eta ezin da automatikoki zehaztu. Berriz ere, zure aukeraketa
-kontserbadorea izan behar da.</para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 </section>
diff --git a/docs/docs/stable/installer/eu/diskPartitioning.xml b/docs/docs/stable/installer/eu/diskPartitioning.xml
new file mode 100644
index 00000000..93a9565f
--- /dev/null
+++ b/docs/docs/stable/installer/eu/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="eu" version="5.0" xml:lang="eu">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/diskdrake.xml b/docs/docs/stable/installer/eu/diskdrake.xml
index cd93050c..a801dad4 100644
--- a/docs/docs/stable/installer/eu/diskdrake.xml
+++ b/docs/docs/stable/installer/eu/diskdrake.xml
@@ -1,51 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" 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" version="5.0" xml:lang="eu" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Pertsonalizatua disko partizioak DiskDrake-rekin</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
+
   <warning>
-    <para revision="3" xml:id="diskdrake-pa1">Zure <literal>/</literal> partizioa enkriptatu nahi baduzu, bereiztutako
-<literal>/boot</literal> partizio bat duzula ziurtatu behar
-duzu. <literal>/boot</literal> partizioaren enkriptatzea ez da erabili
-behar, bestela, zure sistema ez izango da abiarazi.</para>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
   </warning>
-  <para xml:id="diskdrake-pa3" revision="2">Hemen zure disko gogor(ren) egitura estutu. Partizioak gehitu eta kendu
-daitezke, partizio bateko sistema edo tamaina alda daiteke, eta
-haietan hasi baino lehen dagoena arren ikusi.</para>
-  <para xml:id="diskdrake-pa4" revision="1">Erlaitz bat dago disko gogor bakoitzerako edo antzemandako
-biltegiratze-sistemarako, USB unitatea bezala. Adibidez, sda, sdb eta sdc
-hiru aurkitzen badira. </para>
-  <para xml:id="diskdrake-pa5" revision="1">Sakatu <guibutton>Garbitu guztia</guibutton> aukeratutako biltegi gailu
-partizio guztiak garbitzeko</para>
-  <para xml:id="diskdrake-pa6" revision="1">Beste ekintza guztiak: sakatu nahi den partizioa lehenik. Gero ikusi, edo
-aukeratu fitxategi sistema eta muntatze puntua, tamainaz aldatu edo
-garbitu.  <guibutton>Aldatu aditu modura</guibutton> (edo <guibutton>Aditu
-modua</guibutton>) etiketa bat gehitu edo partizio-mota bat aukeratzeko
-bezalako tresna gehiago batzuk ematen ditu. </para>
-  <para xml:id="diskdrake-pa6a" revision="1">Jarraitu dena zure nahiei egokitu arte.</para>
-  <para xml:id="diskdrake-pa7" revision="1">Klik <guibutton>Eginda</guibutton> prest zaudenean.</para>
-  <note>
-    <para>Mageia instalatzen ari bazara UEFI sistema baten, egiaztatu ESP (EFI Sistema
-Partizioa) presente dagoela, eta behar bezala /boot/EFI-n muntatuta (ikus
-goian)</para>
-    <para><mediaobject><imageobject condition="classical"><imagedata fileref="dx2-diskdrake2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-align="center" fileref="live-diskdrake2.png"/></imageobject></mediaobject></para>
-  </note>
-  <note>
-    <para>Mageia Legacy/GPT sisteman instalatzen ari bazara, egiaztatu BIOSen abioko
-partizioa dagoela eta mota zuzena duela</para>
-    <mediaobject>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
+
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
+
+  <figure>
+    <title>EFI System Partition</title>
+
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
+
+  <figure>
+    <title>BIOS boot partition</title>
+
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/eu/doPartitionDisks.xml b/docs/docs/stable/installer/eu/doPartitionDisks.xml
index 09091ca9..6b36684f 100644
--- a/docs/docs/stable/installer/eu/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/eu/doPartitionDisks.xml
@@ -1,82 +1,214 @@
-<?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:lang="eu" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+
   
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
 
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Partizioa egiten</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
-  <para xml:id="doPartitionDisks-pa1" revision="1">Pantaila honetan zure disko gogor(ren) edukia ikus dezakezu eta DrakX
-partizio morroiak <application>Mageia</application> instalatzeko aurkitu
-duen tokia ikusi.</para>
-  <para xml:id="doPartitionDisks-pa2" revision="1">Beheko zerrendatik erabilgarri dauden aukerak bereziki aldatuko dira zure
-disko gogor(rren) diseinu eta edukien arabera.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist><listitem><para revision="1" xml:id="doPartitionDisks-pa4">Lehendik dauden Partizioak</para><para xml:id="doPartitionDisks-pa5" revision="1">Aukera hori eskuragarri badago, orduan Linux partizioak bateragarria aurkitu
-egin dira eta instalazioa erabili ahal izango du.</para></listitem><listitem><para xml:id="doPartitionDisks-pa6" revision="1">Erabili Espazio Hutsa</para><para xml:id="doPartitionDisks-pa7" revision="1">Erabili gabeko espazio baduzu zure disko gogorrean orduan aukera hau
-erabiliko da zure Mageia instalazio berriarentzat.</para></listitem><listitem><para xml:id="doPartitionDisks-pa8" revision="1">Erabili Espazio Librea Windows-en Partizioan</para><para xml:id="doPartitionDisks-pa9" revision="1">Lehendik dauden Windows partiziotik erabili gabeko espazioa baduzu,
-instalatzaileak, erabili ahal izateko eskainiko dizu.</para><para xml:id="doPartitionDisks-pa10" revision="2">Hau zure Mageia-ren instalazio berrirarentzako lekua uzteko modu
-erabilgarria izan daiteke, baina eragiketa arriskutsua da, beraz, fitxategi
-garrantzitsuen babeskopia egin behar duzu!</para><para revision="3" xml:id="doPartitionDisks-pa11">Kontutan prozedura hori dakar Windows partizioaren tamaina
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa5">Aukera hori eskuragarri badago, orduan Linux partizioak bateragarria aurkitu
+egin dira eta instalazioa erabili ahal izango du.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa7">Erabili gabeko espazio baduzu zure disko gogorrean orduan aukera hau
+erabiliko da zure Mageia instalazio berriarentzat.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
+
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
+
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">Kontutan prozedura hori dakar Windows partizioaren tamaina
 murrizteko. Partizio honek "garbi " egon beharko du, hau da, Windows azken
 aldiz erabili denean ondo itxita egon behar du. Halaber desfragmentatuta
 egon behar du, baina horrek ez du bermatzen partizioko fitxategi guztiak
 mugitu egin direla erabiliko den eremutik kanpo. Hori dela eta, Guztiz
-gomendagarria da zure fitxategi pertsonalaren babeskopia bat egitea.</para><para>Aukera honekin instalatzailea gainerako Windows-en partizioa  urdin argiz
-eta etorkizuneko Mageia partizioa urdin ilunez euren xede tamainekin
-erakusten ditu. Tamaina hauek egokitzeko aukera duzu klik eginez eta
-partizioen arteko hutsunea arrastatuz. Ikusi beheko pantaila.</para><mediaobject><imageobject condition="classical"><imagedata
-fileref="dx2-doPartitionDisks2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-fileref="live-doPartitionDisks2.png" align="center"/></imageobject></mediaobject></listitem></itemizedlist> <itemizedlist><listitem><para xml:id="doPartitionDisks-pa12" revision="1">Ezabatu eta erabili disko osoa.</para><para xml:id="doPartitionDisks-pa13" revision="1">Aukera honek disko osoa erabiliko du Mageia-rantzat.</para><para xml:id="doPartitionDisks-pa14" revision="1">Oharra! Aukeratutako disko gogorraren datu guztiak ezabatuko dira. Kontuz
-ibili!</para><para xml:id="doPartitionDisks-pa15" revision="1">Diskoko zati bat beste zerbaitetan erabili edo jada galdu nahi ez duzun
-informazioa baduzu,, ez ezazu aukera hau erabili.</para></listitem></itemizedlist><itemizedlist><listitem><para xml:id="doPartitionDisks-pa16" revision="1">Disko-partizio pertsonalizatua</para><para xml:id="doPartitionDisks-pa17" revision="1">Honek erabateko kontrola ematen dizu instalazioan jartzen zure disko
-gogorrean.</para></listitem></itemizedlist></para>
-  <para><emphasis role="bold">Partizioaren tamaina:</emphasis></para>
-  <para>Instalatzaileak eskuragarri dauden leku partekatuko ditu honako arauen
-arabera:</para>
-  <para><itemizedlist><listitem><para>Eskuragarri dagoen leku guztia 50GB baino gutxiago bada, partizio bat baino
-ez da sortuko /, ez baitago /home partizioa bereizita .</para></listitem><listitem><para>Eskuragarri dagoen leku guztia 50GB baino gehiago baldin bada, orduan, hiru
-partizio sortuko dira</para><itemizedlist><listitem><para>6/19 erabateko espazio libretik /-ra esleitzen da 50 GB-ko gehiengoarekin</para></listitem><listitem><para>1/19 4 GB gehienez trukatzeko esleitzen da</para></listitem><listitem><para>gainerakoa (gutxienez 12/19) da / home-ra esleitzen da</para></listitem></itemizedlist></listitem></itemizedlist></para>
-  <para>Horrek esan nahi du 160 GB-tik eta gehiago eskuragarri, instalatzaileak hiru
-partizio sortuko dituela: 50GB /-rako , 4 GB swap-rako eta gainontzekoa
-/home-entzako.</para>
+gomendagarria da zure fitxategi pertsonalaren babeskopia bat egitea.</para>
+      </important>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa17">Honek erabateko kontrola ematen dizu instalazioan jartzen zure disko
+gogorrean.</para>
+    </listitem>
+  </itemizedlist>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
+
   <note>
-    <para>UEFI sistema bat erabiltzen ari bazara, ESP (EFI sistema partizioa)
-automatikoki detektatu egingo da, edo sortu ez bada existitzen oraindik, eta
-/boot/EFI-n muntatu. "Disko partizio pertsonalizatua" aukerak arrakastaz
-bete dela frogatzen du.</para>
+    <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
-  <note>
-    <para>If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk,
-you need to create a Bios boot partition if not already existing. It is an
-about 1 MiB partition with no mount point. Choose <xref
-linkend="diskdrake"/> to be able to create it with the Installer like any
-other partition, just select BIOS boot partition as filesystem type.</para>
-    <mediaobject>
+
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
-  <warning>
-    <para>Zenbait disko gogor berri 4096-byteko sektore logikoak erabilitzen dituzte,
-512 byte estandarraren ordez. Hardware librerik ezagatik partizio tresna ez
-da egiztatu halako diskoetan. Gainera, SSD disko batzuek 1MB baino gehiagoko
-ezabatze bloke bat darabilte. Iradokitzen dugu aurrez partiziorako beste
-tresna mota bart erabiltzea gparted bezala, mota honetako disko bat izanez
-gero, eta hurrengo konfigurazioak erabil ditzala:</para>
-    <para>"lerrokatu" "MiB"</para>
-    <para>"Aurreko espazio librea (MiB)" "2"</para>
-    <para>Ziurtatzen partizio guztiak sortzen diturela megabyte kopuru batekin.</para>
-  </warning>
-</section>
\ No newline at end of file
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
+
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+
+  <important>
+    <para>Some newer drives are now using 4096 byte logical sectors, instead of the
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Also make sure all partitions are created using an even number of megabytes.</para>
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/eu/exitInstall.xml b/docs/docs/stable/installer/eu/exitInstall.xml
index 8590c437..2300185a 100644
--- a/docs/docs/stable/installer/eu/exitInstall.xml
+++ b/docs/docs/stable/installer/eu/exitInstall.xml
@@ -1,20 +1,32 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xml:id="exitInstall" version="5.0" xml:lang="eu">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0" xml:lang="eu">
   <info>
     <title xml:id="exitInstall-ti1">Zorionak</title>
   </info>
+
   
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
-  <para xml:id="exitInstall-pa1" revision="2"><application>Mageia</application> instalatzen eta konfiguratzen amaitu duzu
-eta orain segurua da instalazio baliabidea kentzea, eta zure ordenagailua
-berrabiaraztea.</para>
-  <para xml:id="exitInstall-pa2" revision="2">Berrezarri ondoren, abioko kargatzailea, zure ordenagailuko sistema
-eragileen artean aukera dezakezu (bat baino gehiago izanez gero).</para>
+
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
+
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
+
   <para xml:id="exitInstall-pa3" revision="1">Zuk ez badituzu abio kargatzaile ezarpenak doitzen, zure Mageia instalazioa
 automatikoki hautatu eta hasiko da.</para>
+
   <para xml:id="exitInstall-pa4" revision="1">Gozatu!</para>
-  <para xml:id="exitInstall-pa5" revision="1">Bisitatu www.mageia.org zalantzarik izanez gero edo mageia lagundu nahi
-izanez</para>
+
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/firewall.xml b/docs/docs/stable/installer/eu/firewall.xml
index f62c93cb..4bd68a74 100644
--- a/docs/docs/stable/installer/eu/firewall.xml
+++ b/docs/docs/stable/installer/eu/firewall.xml
@@ -1,33 +1,37 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="eu">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="eu" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Suhesia</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Suhesia</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">Atal honek suhesi arau sinple batzuk konfiguratzeko aukera ematen du:
-helburuko sistemak interneten bidez zein motatako mezuak onartuko diren
-zehaztuko du. Berriz, honek, sistemaren zerbitzu egokiak Internetetik
-sartzeko errazak izan daitezela baimentzen du.</para>
+  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+determine which type of message from the Internet will be accepted by the
+target system. This, in turn, allows the corresponding services on the
+system to be accessible from the Internet.</para>
 
-  <para>In the default setting, no button is checked - no service of the system is
-accessibly from the network. The "<emphasis>Everything (no
-firewall)</emphasis>" button has a particular role: it enables access to all
-services of the machine - an option that does not make much sense in the
-context of the installer since it would create a totally unprotected
-system.  Its veritable use is in the context of the Mageia Control Center
-(which uses the same GUI layout) for temporarily disabling the entire set of
-firewall rules for testing and debugging purposes.</para>
+  <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
 
-  <para>Gainontzeko checkbutton guztiak gutxi gorabehera azaleratzen dira. Adibidez,
-"CUPS zerbitzaria" botoia egiaztatuko duzu zure makinako inprimagailuak
-sarean eskuragarri nahi badituzu.</para>
+  <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Aurreratua</emphasis></para>
 
-  <para>The set of checkbuttons only comprises the most common services. The
-"Advanced" button allows to enable messages that correspond to a service for
-which no checkbutton exists. The "<emphasis>Advanced</emphasis>" button
-opens a window where you can enable a series of services by typing a list of
-couples (blank separated)</para>
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
 
diff --git a/docs/docs/stable/installer/eu/formatPartitions.xml b/docs/docs/stable/installer/eu/formatPartitions.xml
index 2cd3c180..b141f1f5 100644
--- a/docs/docs/stable/installer/eu/formatPartitions.xml
+++ b/docs/docs/stable/installer/eu/formatPartitions.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="formatPartitions">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formateatzen</title>
   </info>
@@ -7,41 +13,41 @@
   
 
   
+
   
+
   
+
   
-  
-  
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-formatPartitions.png" format="PNG" align="center"
-xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-formatPartitions.png" format="PNG" align="center"
-xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="formatPartitions-pa1">Hemen aukera dezakezu zer partizio formateatu nahi. <emphasis>Ez</emphasis>
-formateatzeko markatutako partizioetako edozein datu gordeko dira.</para>
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
+partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa2">Normalean gutxienez DrakX hautatutaako partizioak, formateatu behar izaten
-dira</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa3">Klikatu <guibutton>Aurreratua</guibutton> hautatzeko partizioko
-<emphasis>Bloke okerrak</emphasis> egiaztatzeko.</para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para revision="1" xml:id="formatPartitions-pa4">Ez bazaude ziur aukeraketa egokia egin duzula,
-<guibutton>Atzera</guibutton>, eta berriro <guibutton>Atzera</guibutton> eta
-gero <guibutton>Pertsonalizatuan</guibutton> klik egin dezakezu hasierako
-pantailara itzultzeko. Pantaila honetan zure partizioek dutena ikus dezakzu.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para revision="1" xml:id="formatPartitions-pa5">Zure aukeretaz ziur zaudenean, <guibutton>Hurrengoa</guibutton> botoia
-klikatu jarraitzeko.</para>
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
 </section>
diff --git a/docs/docs/stable/installer/eu/graphicalConfiguration.xml b/docs/docs/stable/installer/eu/graphicalConfiguration.xml
new file mode 100644
index 00000000..84fe7510
--- /dev/null
+++ b/docs/docs/stable/installer/eu/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/eu/installUpdates.xml b/docs/docs/stable/installer/eu/installUpdates.xml
index 9c53f496..74d77a66 100644
--- a/docs/docs/stable/installer/eu/installUpdates.xml
+++ b/docs/docs/stable/installer/eu/installUpdates.xml
@@ -1,31 +1,46 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="eu">
+  
 
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="installUpdates"><info><title xml:id="installUpdates-ti1">Eguneraketak</title></info>
+  
 
+  
 
+  
 
+  
 
- 
- 
- 
+  
 
-   <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-installUpdates.png"
-format="PNG" align="center" xml:id="installUpdates-im1"></imagedata>
-</imageobject></mediaobject> 
-
- <para revision="1" xml:id="installUpdates-pa1"><application>Mageia</application>-ko bertsio hau askatu zenetik, pakete
-batzuk eguneratu edo hobetu dira.</para>
-
-  <para revision="1" xml:id="installUpdates-pa2"><guilabel>Bai</guilabel> aukeratu instalatu nahi baduzu,
-<guilabel>Ez</guilabel> aukeratu orain egin nahi ez baduzu, edo Internetera
-konektaturik ez bazaude</para>
-
-  <para revision="1" xml:id="installUpdates-pa3">Ondoren, sakatu <guibutton>Hurrengoa</guibutton> jarraitzeko</para>
-
-</section>
-  
\ No newline at end of file
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Eguneraketak</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
+align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+    </listitem>
+
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/installer.xml b/docs/docs/stable/installer/eu/installer.xml
index e8e64302..c7fd4add 100644
--- a/docs/docs/stable/installer/eu/installer.xml
+++ b/docs/docs/stable/installer/eu/installer.xml
@@ -1,166 +1,169 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="installer">
-  <info>
-    <title xml:id="Select-and-use-ISOs-ti1">DrakX, Mageia Instalatzilea</title>
-  </info>
-
-  <para>GNU-Linux-eko erabiltzaile berri edo aurreratu bat bazara, Mageia-ren
-instalatzailea diseinatuta dago zure instalazioa edo eguneratzea posible
-bezain erraz egiten laguntzeko.</para>
-
-  <para>Hasierako menuak hainbat aukera ditu, baina aukera lehenetsia instalatzailea
-da, normalean, behar duzun guztia dela.</para>
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="installer"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
 
-  <section>
-    <title>Instalazio Ongi etorri Pantaila</title>
+  
 
-    <section>
-      <title>Mageia DVDa erabiliz</title>
+  
 
-      <para>Hemen lehenetsitako ongietorri pantaila, Lehenean UEFI sistema batekin eta
-bigarrenean Legacy sistema duen Mageia DVD bat erabiliz:</para>
+  
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
-
-      <para>Pantaila honetan, aukerak sartzeko sakatu "e" letra "editatzeko moduan"
-sartzeko. Pantaila honetara itzultzeko, sakatu "esc" tekla irten eta gorde
-gabe edo sakatu "Ktrl" edo "F10" tekla gorde eta irtetzeko.</para>
-
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
+  
 
-      <para>Pantaila honetatik, posiblea da hobespen pertsonal batzuk ezartzea:<itemizedlist>
-          <listitem>
-            <para>Hizkuntza (instalaziorako soilik, sisteman aukeratutako hizkuntzaren
-desberdinak izan daitezke) F2 gakoa sakatuz (Ondare moduan soilik)</para>
+  
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
+  
 
-            <para>Erabili geziak hizkuntza aukeratzeko eta sakatu Sartu.</para>
+  
 
-            <para>Hemen adibide bat dago, CD/DVD Live mota erabiltzean agertutako Frantsesezko
-ongietorri pantaila. Nabaritu aipaturiko CD/DVDaren menuak ez duela
-proposatzen: <guilabel>Berreskuratze Sistema</guilabel>,
-<guilabel>Memoriaren Frogapena</guilabel> ezta <guilabel>Hardwarea
-antzemateko tresnarik</guilabel> ere.</para>
+  
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome4fr.png"/> </imageobject></mediaobject>
-          </listitem>
+  
 
-          <listitem>
-            <para>Aldatu pantailaren bereizmena F3 tekla (Ondare moduan soilik) sakatuz.</para>
+  <info>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, Mageia Instalatzilea</title>
+  </info>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
+  <para>GNU-Linux-eko erabiltzaile berri edo aurreratu bat bazara, Mageia-ren
+instalatzailea diseinatuta dago zure instalazioa edo eguneratzea posible
+bezain erraz egiten laguntzeko.</para>
 
-          <listitem>
-            <para>Gehitu kernel aukera batzuk <emphasis role="bold">F6</emphasis> ondare
-moduan edo <emphasis role="bold">e</emphasis> sakatuz  UEFI modurako.</para>
+  <section>
+    <title>Instalazio urratsak</title>
 
-            <para>Instalazioak huts egiten badu, orduan berriro beste aukera osagarri
-batzuekin saiatzea beharrezkoa izan daiteke. F6 sakatzen duzunean agertzen
-den menuak lerro <guilabel>Abio aukarak</guilabel> berri bat erakusten du
-eta lau aukera proposatzen ditu:</para>
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
-            <para>- Berez, ez du lehenetsitako aukeretan ezer aldatzen.</para>
+  <section>
+    <title>Instalazio Ongi etorri Pantaila</title>
 
-            <para>- Berez, ez du lehenetsitako aukeretan ezer aldatzen.</para>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-            <para>- ACPI-rik gabe (Advanced Configuration and Power Interface),
-energia-administrazioa ez da kontuan hartzen.</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
 
-            <para>- APIC-a Lokalik (Local Advanced Programmable Interrupt Controller) gabe,
-CPU-aren etenez dihardu. Aukera hau aukeratu ezazu eskatzen bazaizu.</para>
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
-            <para>Sarrera horietako bat hautatzean, <guilabel>Abio aukera</guilabel> lerroan
-erakutsitako jatorrizko aukerak aldatzen dira.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-            <note>
-              <para>Maegia bertsio batzuetan, hautatutako F6 gakoarekin hautatutako aukerak ez
-direla <guilabel>Abio aukerak</guilabel> lerroan agertzen gerta
-daiteke. Hala ere, kontuan izango dira.</para>
-            </note>
+      <itemizedlist>
+        <title>Menu</title>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
 
-          <listitem>
-            <para>Gehitu kernel aukera gehiago F1 tekla (Ondare moduan soilik) sakatuz.</para>
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
 
-            <para>F1 Sakatuz aukera berrien leihoa irekitzen da. Bat aukera ezazu
-gezi-teklekin eta ENTER-a saka ezazu xehetasun gehiago izateko edo Esc tekla
-saka ezazu ongietorri-pantailara itzultzeko.</para>
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
 
-            <para>Aukeren pantailaren ikuspegi zehatza. Sakatu Esc edo hautatu
-<guilabel>Abioko aukeretara Itzultzea</guilabel> aukeren zerrendara
-itzultzeko. Aukera hauek eskuz gehitu daitezke <guilabel>Abioko
-Aukera</guilabel> lerroan.</para>
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
 
-            <note>
-              <para>Laguntzak F2 teklaz aukeratutako hizkuntza emaitza du.</para>
-            </note>
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
 
-            <para>Kernel ondare eta UEFI sistemtako aukerei buruzko informazio gehiago
-lortzeko, ikus:<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
 
     <section>
-      <title>Kabledun sarea erabiltzen</title>
+      <title>UEFI Systems</title>
 
-      <para>Hona hemen hasierako pantaila kable sare instalazioan oinarritzen CD bat
-erabiltzen denean (netinstall.iso edo netinstall-nonfree.iso imajinak)</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-      <para>Ezin duzu hizkuntza aldatu, aukerak pantailan azaltzen dira. Haridun Sarean
-oinarritutako instalazio CDa  nola erabiltzeari buruzko informazio gehiago
-lortzeko, bisitatu <link
-ns2:href="https://wiki.mageia.org/en/Boot.iso_install">Mageiaren
-Wiki-a</link></para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-      <warning>
-        <para>Teklatuaren diseinua amerikarra da.</para>
-      </warning>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="../dx-help.png"/> </imageobject></mediaobject>
-    </section>
-  </section>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
 
-  <section>
-    <title>Instalazio urratsak</title>
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
 
-    <para>Instalazio prozesuko hainbat urrats pantailaren alboko panelean jarraitu
-daitezke.</para>
-
-    <para>Urrats bakoitzak pantailetan bat edo gehiago ditu aukera osagarrietarako
-botoiak <guibutton>Aurreratua</guibutton> izan dezakeena, normalean gutxi
-erabiltzen dira .</para>
-
-    <para>Pantailak gehienek <guibutton>Laguntza</guibutton> botoiak dituzte, zienek
-pausuei buruzko azalpenak emango dizute.</para>
-
-    <note>
-      <para>Instalazioan zehar nonbait instalazioa gelditzea erabakitzen baduzu,
-berrastea posiblea da, baina bi aldiz pentsa ezazu. Behin partizio bat
-formateatu denez gero edo behin eguneratzeak jartzen hasi direnean, zure
-ordenagailua ez da egoera berean izango eta berrabiarazteak sistema
-erabilezinarekin utz dezake. Hala ere, berrastea erabakitzen baduzu,
-terminalera sar zaitez <guilabel>Alt Ctrl F2</guilabel> aldi berean
-sakatuz. Gero, <guilabel>Alt Ctrl Delete</guilabel> saka ezazu aldi berean
-berrasteko.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -171,19 +174,20 @@ berrasteko.</para>
 
       <itemizedlist>
         <listitem>
-          <para>Hasierako pantailaren ondoren, ez du hizkuntzako aukeraketa pantaila
-kargatzen. Hau gerta daiteke txartel grafiko batzuekin eta sistema
-zaharrekin. Saiatu bereizmen bajuago bat erabiltzea, <code>vgalo</code>
-terminalean idatziz.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
-          <para>Hardwarea zaharra bada, Beharbada ez da posible instalazio grafikoa
-egitea. Aipaturiko kasuan, testu modu instalazio bat saia liteke. Aipaturiko
-modua burutzeko, ESC sakatu ezazu lehen ongietorri-pantailan zehar eta ENTER
-sakatuz egiazta ezazu. Pantaila beltza agertuko da "boot" hitzarekin. "text"
-idatz ezazu eta ENTER sakatu ezazu. Orain testu moduko instalazioarekin
-jarrai ezazu.</para>
+          <para>If the hardware is very old, a graphical installation may not be
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -191,33 +195,31 @@ jarrai ezazu.</para>
     <section>
       <title>Instalatu Osagaiak</title>
 
-      <para>Sistemak instalazioan zehar izoztu egiten dela badirudi, hardware
-detekzioekin arazoa izan daiteke. Kasu honetan, hardwareko detekzio
-automatikoa desaktiba daiteke eta gero ezarri daiteke. Hau probatzeko,
-<code>noauto</code> idatz ezazu terminalean. Beharrezkoa bada aukera hau
-beste batzuekin konbina daiteke.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
       <title>RAM arazoak</title>
 
-      <para>Hura behar izatea arraroa da, baina kasu batzuetan, hardwareak RAM-aren
-kantitate libreari buruz oker informa dezake. Hura eskuz zehazteko,
-<code>mem=xxxM</code> parametroa erabil dezake, xxx RAM-aren kantitate
-zuzena den, adibidez: <code>mem=256M</code>-ak RAM 256MB esan nahi izango
-lituzke.</para>
+      <para>This will rarely be needed, but in some cases the hardware may report the
+available RAM incorrectly. To specify this manually, you can use the
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Partizio dinamikoak</title>
 
-      <para>Zuk "oinarrizko" formatutik zure disko gogorra "dinamiko"-ra bihurtu
-bazenuen Microsoft Windows-en, Mageia disko honetan jartzea ezinezkoa izango
-dela jakin behar duzu. Oinarrizko diskora itzultzeko Microsoft-eko
-dokumentazioa ikus ezazu:  <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
-
-  <section/>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eu/locale.xml b/docs/docs/stable/installer/eu/locale.xml
new file mode 100644
index 00000000..2abbcc36
--- /dev/null
+++ b/docs/docs/stable/installer/eu/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/eu/login.xml b/docs/docs/stable/installer/eu/login.xml
index 19ce8bf3..1b519f1c 100644
--- a/docs/docs/stable/installer/eu/login.xml
+++ b/docs/docs/stable/installer/eu/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="eu"><info><title xml:id="label-to-adapt-ti1">Sarrera pantaila</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM sarrera pantaila</para></caption></mediaobject><para>Azkenik, saio hasiera pantailara zatoz.</para><para>Idatzi zure erabiltzaile izena eta erbiltzaile pasahitza, eta segundo
-batzuen buruan aurkituko zara KDE edo GNOME mahaigain batekin, bertan
-erbiltzen ari zaren live baliabearen arabera. Orain hasi zaitezke zure
-Mageia instalazioa erabiliz.</para><para>Aurki ditzakezu <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">hemen</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="eu">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/media_selection.xml b/docs/docs/stable/installer/eu/media_selection.xml
index 9d560287..149f2f20 100644
--- a/docs/docs/stable/installer/eu/media_selection.xml
+++ b/docs/docs/stable/installer/eu/media_selection.xml
@@ -1,18 +1,31 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="eu">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Baliabide Aukeraketa (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
+
   
+
   
+
   
 
-<mediaobject>
+  
+  
+  <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
 <imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
 format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
@@ -28,20 +41,19 @@ oinarria daukanez gero.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis>Nonfree</emphasis> biltegiak doakoak diren paketeak ditu, hau da,
-mageia birbana ditzake, baina softwarea kode itxiko paketeak, eta hortik
-datorkio nonfree izena. Adibidez, biltegiak barnean nVidia eta ATI txartel
-grafiko, hainbat WiFi txartelentzako firmware, gidariak jabedun, ea hartzen
-ditu.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis>Tainted</emphasis> biltegiak barne hartzen ditu doako
-lizentziapean argitaratutako paketeak. Paketeak biltegi honetan jartzeko
-irizpide nagusia patenteak eta copyright herri batzuetako legeak hauts
-daitezkeela da, hala nola, zenbait audio/bideo,  DVD komertzial bideo, etab
-erreproduzitzeko beharrezkoak diren multimedia codec batzuk bezalako
-paketeak, etab.</para>
+      <para>The <emphasis>Tainted</emphasis> repository includes packages released under
+a free license. The main criteria for placing packages in this repository is
+that they may infringe patents and copyright laws in some countries,
+e.g. multimedia codecs needed to play various audio/video files; packages
+needed to play commercial video DVD's, etc.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eu/minimal-install.xml b/docs/docs/stable/installer/eu/minimal-install.xml
index 479dcf3e..07693aa5 100644
--- a/docs/docs/stable/installer/eu/minimal-install.xml
+++ b/docs/docs/stable/installer/eu/minimal-install.xml
@@ -1,45 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" xml:id="minimal-install"
-         xmlns="http://docbook.org/ns/docbook"
-	 xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="eu">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Instalazio Minimoa</title>
   </info>
 
   
+
+  
+
+  
+
+  
+
   
 
-  <para>Instalazio txikiena aukeratu dezakezu pakete taldeen pantailan dena
-desautatuz, ikus <xref linkend="choosePackageGroups"></xref>.</para>
-  <para>Nahi izanez gero, halaber "banakako pakete aukeraketa" egiaztatu dezakezu
-pantaila berean.</para>
-  <para><application>Mageiaren</application> erabilera espezifikoak buruan
-dutenentzat dago zuzenduta instalazio minimoa, zerbitzari edo lanpostu
-espezialitatua bezala. Seguruenik aukera hau "Banakako pakete aukeraketa"
-aipatutako aukera konbinatuta erabili ahal izango duzu,  instalazioa
-fintzeko, ikus <xref linkend="choosePackagesTree"></xref>.</para>
-  <para>Instalazio mota hau aukeratuz gero, ondoko pantailan osagarri erabilgarri
-batzuk eskainiko ditu, hala nola, dokumentazioa eta X.</para>
-  <para>"X-ekin" hautatzen bada, IceWM idazmahai arin gisa egongo da.</para>
-  <para>Oinarrizko dokumentazioa man edo info orri forman ematen da. Batetik man
-orriak <link xlink:href="http://www.tldp.org/manpages/man.html">Linux
-Documentation Project</link> eta bestetik <link
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
+xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
+Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
-coreutils</link> info orriak biltzen ditu.</para>
+coreutils</link> info pages.</para>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" fileref="dx2-minimal-install.png"
-align="center" format="PNG" xml:id="minimal-install-im1"></imagedata>
+<imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
+align="center" fileref="dx2-minimal-install.png" revision="1"/>
 </imageobject></mediaobject>
-
-  </section>
-
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/misc-params.xml b/docs/docs/stable/installer/eu/misc-params.xml
index bbdc3683..4cd24a6d 100644
--- a/docs/docs/stable/installer/eu/misc-params.xml
+++ b/docs/docs/stable/installer/eu/misc-params.xml
@@ -1,21 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Hainbat parametroen laburpena</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
-
-  <para xml:id="misc-params-pa1" revision="1">DrakX adimentasunez hautatzen ditu ezarpenak zure sistemaren detektatutako
-hardwarearen arabera. Ezarpenak egiaztatu ahal izango dituzu hemen eta
-<guibutton>Ezarri</guibutton> sakatu aldatu nahi baduzu.</para>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+  <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
 
   <note>
-    <para>Arau orokor gisa, ezarpen lehenetsiak gomendatzen dira eta 3 salbuespen
-gorde ditzakezu:<itemizedlist>
+    <para>As a general rule, it is recommended that you accept the default settings
+unless:<itemizedlist>
         <listitem>
           <para>Badago arazo ezagun bat ezarpen lehenetsiarekin</para>
         </listitem>
@@ -25,7 +42,7 @@ gorde ditzakezu:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>Beste zerbait esaten da beheko atal zehatzetan</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -37,48 +54,47 @@ gorde ditzakezu:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Denbora-Eremua</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX ordu eremua hautatutako hizkuntzaren arabera aukeratzen du. Aldatu
-nahi baduzu, behar izanez gero, Ikusi ere <xref
-linkend="configureTimezoneUTC"/></para>
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Herrialde/Eskualde</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
-        <para xml:id="misc-params-system-pa3a" revision="1">Aukeratutako herrian ez bazaude, zuk hura zuzentzea garrantzitsua da.  Ikus
-<xref linkend="selectCountry"/></para>
+        <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
+setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Abio kargatzailea</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX aukera onak egin ditu abio kargatzailearen ezarpenekin.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Ezer ez aldatu, Grub2 konfiguratzeaz jakin ezean</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Informazio gehiagorako, ikus <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Erabiltzaile kudeaketa</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Erabiltzaile extrak hemen gehi dezakezu. Bakoitzak bere
-<literal>/home</literal> direktorioa izango du.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Zerbitzuak</guilabel>:</para>
-
-        <para xml:id="misc-params-system-pa6a" revision="1">Sistema Zerbitzuak atzeko aldean abian dauden programa txikiak aipatzeko
-(deabru) bezala ezagutzen da. Tresna honek horietako batzuk gaitu edo
-desgaitzeko aukera ematen dizu.</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Arretaz pentsatu behar duzu hemen ezer aldatu aurretik, hutsegite batek
-ordenagailuak gaizki funtzionatzea eragin dezake.</para>
+        <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
+(daemons).  This tool allows you to enable or disable certain processes.</para>
 
-        <para>For more information, see <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -90,10 +106,10 @@ ordenagailuak gaizki funtzionatzea eragin dezake.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Teklatua</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa1a" revision="1">Hemen da non teklatuaren antolamendua ezarri edo aldatu ditzakezun  zure
-kokapen, hizkuntza edo teklatu motaren arabera.</para>
+        <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
+of keyboard.</para>
 
         <note>
           <para>Teklatuaren diseinu oker bat nabaritzen baduzu eta aldatu nahi baduzu,
@@ -102,28 +118,32 @@ kontuan izan zure pasahitzak ere aldatu egingo direla.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Sagua</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Hemen gehitu edo konfiguratu dezakezu beste gailu batzuk, tabletak,
 trackballs, etab </para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Soinu txartela</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">Instalatzaileak gidari lehenetsia erabiltzen du, baldin badago. Gidari bat
-baino gehiago dagoenean agertzen da beste bat aukeratzeko aukera soilik,
-baina bat ere ez dator lehenetsita.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Interfaze grafikoa</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Atal honen bitartez, zure txartel grafikoa(k) eta pantaila konfigura
-dezakezu.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Informazio gehiagorako, ikus <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -138,27 +158,28 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Sarea</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
-        <para xml:id="misc-params-network-pa2" revision="1">Zure sarea hemen ezarri ditzakezu, baina gidari libre gabeko txartelentzat
-(nonfree), berrabiarazi ostean egite hobea da, <application>Mageiaren
-Kontrol Gunean</application>, non-free biltegiak gaituta eduki ondoren.</para>
+        <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
+repositories.</para>
 
         <warning>
-          <para xml:id="misc-params-network-pa3" revision="1">Sare txartel bat gehitzen duzunean, ez ahaztu zure suebakia interfazena
-ezartzen, ikusteko ere.</para>
+          <para xml:id="misc-params-network-pa3" revision="1">When you add a network card, do not forget to set your firewall to monitor
+that interface as well.</para>
         </warning>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxiak</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">Proxy-zerbitzari batek zure ordenagailuaren eta Interneten arteko
-bitartekari bat bezala jokatzen du. Sail honek proxy-zerbitzua zure
-ordenagailuak erabiltzeko ezarpenak jartzeko baimentzen dizu.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">Zure sistema administratzaileari kontsultatu beharko diozu eskuratzeko hemen
-sartu beharreko parametroak</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -170,29 +191,31 @@ sartu beharreko parametroak</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Segurtasun Maila</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Hemen ezarri daiteke zure ordenagailurako desiratzen duzun segurtasun maila,
-gehienetan, lehenetsitako ezarpena (Estandarra) egokitzen du erabilera
-orokorrerako.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Begiratu zure erabilerara hoberen egokitzen den aukera.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Suebakia</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">Suebaki baten asmoa, zure artxibo garrantzitsuen eta Internetetik dabiltzan
-asmo txarreko jende ugariren, lapurtzen saia daitezkeen edo zure artxiboak
-arriskuan jarri dezaketenen artean hesi bat jartzea da.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Aukera itzazu zure sisteman sartu nahi dituzun zerbitzuak. Zure aukeraketa
-zure ordenagailuan egiten duzun erabileraren mende egongo da. Informazio
-gehiago lortzeko, ikus<xref linkend="firewall"/> .</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Kontuan izan dena ahalbidetzea (suebaki gabe) oso arriskutsua izan
-daitekeela.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/eu/reboot.xml b/docs/docs/stable/installer/eu/reboot.xml
index 90ec5831..f731ad9f 100644
--- a/docs/docs/stable/installer/eu/reboot.xml
+++ b/docs/docs/stable/installer/eu/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="eu" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Berrabiarazi</title>
   </info>
   
-  <para>Behin kargatzailea instalatuta, eskatuko dizu zure ordenagailua gelditzeko,
-zuzeneko CD-a kendu eta ordenagailua berrabiarazteko. klikatu<emphasis
-role="bold"><guibutton>Amaitu</guibutton></emphasis> eta egin ezazu
-<emphasis role="bold"> agindu honetan eskatutakoa!</emphasis></para>
+  
+  <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>Abiaraztean, deskarga aurrerapen barra segida bat ikusiko duzu. Hornek
-adierazten du software baliabide zerrendak deskargatzen ari direla (ikus
-Software kudeaketa). </para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/eu/securityLevel.xml b/docs/docs/stable/installer/eu/securityLevel.xml
index f2c579bf..d81ed7fc 100644
--- a/docs/docs/stable/installer/eu/securityLevel.xml
+++ b/docs/docs/stable/installer/eu/securityLevel.xml
@@ -1,32 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="securityLevel" version="5.0" xml:lang="eu">
+<section version="5.0" xml:lang="eu" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="securityLevel-ti1">Segurtasun-maila</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="securityLevel-ti1">Segurtasun-maila</title>
-    </info>
+  
 
- 
- 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-securityLevel.png"
-align="center" format="PNG" xml:id="securityLevel-im1"></imagedata>
-</imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
-    <para revision="1" xml:id="securityLevel-pa1">Zure segurtasun maila egokitu dezakezu hemen.</para>
+  <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-    <para revision="1" xml:id="securityLevel-pa2">Zuk zer aukeratu ez badakizu, lehenetsitako konfigurazioa utz ezazu.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
 
-    <para revision="2" xml:id="securityLevel-pa3">Instalatu ondoren, beti posible da <guilabel>Segurtasuna</guilabel> Mageia
-Kontrol Gunean segurtasun ezarpenak aldatzea.</para>
-  </section>
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
+  <para><emphasis role="bold">Security Administrator</emphasis></para>
+
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
+send <emphasis>security alert messages</emphasis> when it detects situations
+which require notification to a system administrator.</para>
+
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
+
+  <note>
+    <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
+messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
+be configured for receiving such mail!</para>
+  </note>
+
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/eu/selectCountry.xml b/docs/docs/stable/installer/eu/selectCountry.xml
index 4868fc02..f3ca47bb 100644
--- a/docs/docs/stable/installer/eu/selectCountry.xml
+++ b/docs/docs/stable/installer/eu/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="eu">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="eu">
   <info>
     <title xml:id="selectCountry-ti1">Aukeratu zure Herrialdea / Eskualdea</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Aukeratu herrialdea edo lurraldea. Ezarpen guztientzako garrantzitzua da,
-hala nola moneta eta haririk gabeko erregulazioa. Okerreko herrialdea
-ezartzen baduzu, hari gabeko konexioa ezingo duzu erabili.</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+like the currency and wireless regulatory domain. Setting the wrong country
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">Zure herrialdea zerrendan ez badago, sakatu <guilabel>Beste
-Herrialdeak</guilabel> eta aukeratu zure herrialde / eskualdea han.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">Zure herrialdea <guilabel>Beste Herrialde</guilabel> zerrendan soilik
-badago, <guibutton>Ados</guibutton> sakatu ondoren lehen zerrendako beste
-bat hautatuta bezala agertu daiteke. Mesedez, ez egin jaramonik honi, DrakX
-zure benetako aukera jarraituko du.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,21 +40,19 @@ zure benetako aukera jarraituko du.</para>
       <title xml:id="inputMethod-ti7">Sarrera metodoa</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1"><guilabel>Beste herrialde</guilabel> pantailan metodoa aukera dezakezu
-lehenik (zerrendaren amaieran) ere. Sarrera-metodoek erabiltzaileei
-baimentzen diete hizkuntza anizkuneko karaktereak (Txinatar, Japoniar,
-Korearra, etab.) sartzea. IBus metodoa lehenetsita dago Mageiaren DVD-etan,
-Afrika/India eta Asia/ez-India Live-CDa. Asiar eta Afrikar kokapenetarako,
-IBus metodoa sarrera bezala ezarriko da lehenik, erabiltzaileek ez dute
-eskuz itxuratu behar izango. Beste sarrera metodo batzuk lehenik (SCIM,
-GCIN, HIME, etab.) antzeko funtzioak ere hornitzen dute eta HTTP/FTP
-baliabideak pakete-aukeraketa baino lehen gehitu bazenituen instalatu
-daitezke.</para>
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
+input method (at the bottom of the list). Input methods allow users to input
+multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
+default input method, so users should not need to configure it
+manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
+functions and can be installed if you added HTTP/FTP media before package
+selection.</para>
 
     <note>
-      <para xml:id="selectCountry-pa5" revision="1">Ahaztu duzu instalazioan zehar sarrera metodoa konfiguratzea, zure sistema
-instalatutakoan egin dezakezu, sartu "Zure Ordenagailua konfiguratu" ->
-"Sistema" edo localdrake root gisa exekutatuz.</para>
+      <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/selectInstallClass.xml b/docs/docs/stable/installer/eu/selectInstallClass.xml
index 7b293ef5..832fe739 100644
--- a/docs/docs/stable/installer/eu/selectInstallClass.xml
+++ b/docs/docs/stable/installer/eu/selectInstallClass.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- 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="eu" xml:id="selectInstallClass">
+<section version="5.0" xml:lang="eu" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
 
   
 
@@ -14,6 +15,13 @@
   
 
   
+
+  
+
+  
+
+  
+
   
 
   <info>
@@ -23,52 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Instalatu edo Berritu</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectInstallClass.png" align="center"
-format="PNG"></imagedata> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Instalatu</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Aukera hau erabili ezazu <application>Mageia</application> instalazio fresko
-baterako.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Berritu</para>
-
-      <para><application>Mageia</application> bertsio bat edo gehiago instalaturik
-baduzu zure siteman, instalatzaileak haietako bat azken bertiora eguneratzea
-utziko dizu.</para>
-
-<warning>
-	<para>Gaurkotzearen testatzea soilik egin da oraindik instalatzailearen bertsio
-hau bota <emphasis>zenean jasanda zegoen</emphasis> Mageia-ko aurreko
-bertsiotik. Mageia-ko euskarri-amaierara jada heldu den bertsioa eguneratu
-nahi baduzu, zure <literal>/home</literal> partizioa babestuz instalazio
-garbia egitea hobea da.</para>
-</warning>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
+
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>Instalazioan zehar instalazioa gelditzea erabakitzen baduzu, berrastea
-posiblea da, baina bi aldiz pentsa ezazu. Behin partizio bat formateatu
-denez gero edo behin eguneratzeak jartzen hasi direnean, zure ordenagailua
-ez da egoera berean izango eta berrabiarazteak sistema erabilezinarekin utz
-dezake. Hala ere, berrastea erabakitzen baduzu, terminalera sar zaitez
-<guilabel>Alt Ctrl F2</guilabel> aldi berean sakatuz. Gero, <guilabel>Alt
-Ctrl Delete</guilabel> saka ezazu aldi berean berrasteko.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
-    <para>Zuk konturatu bazara hizkuntza gehigarri bat aukeratzea ahaztu duzula,
-"Instalatu edo Eguneratu" pantailatik itzuli zaitezke hizkuntza aukeretara
-<guilabel>Ctrl Alt Hasi</guilabel> sakatuz. <emphasis>Ez</emphasis> egin hau
-instalazioan zehar.</para>
+    <para>If you have discovered that you forgot to select an additional language, you
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
 </section>
diff --git a/docs/docs/stable/installer/eu/selectKeyboard.xml b/docs/docs/stable/installer/eu/selectKeyboard.xml
index 8ff02d30..bd21e10e 100644
--- a/docs/docs/stable/installer/eu/selectKeyboard.xml
+++ b/docs/docs/stable/installer/eu/selectKeyboard.xml
@@ -10,9 +10,18 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Teklatua</title>
   </info>
 
@@ -20,7 +29,7 @@
 ez bada aurkitzen, Amerikar teklatua aukeratuko da.</para>
 
   <mediaobject>
-<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png" />
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
@@ -34,22 +43,22 @@ xlink:href="http://es.wikipedia.org/wiki/Distribuci%C3%B3n_del_teclado">es.wikip
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="selectKeyboard-pa3">Zure teklatua zerrendan ez badago, sakatu <guibutton>Gehiago</guibutton>
-zerrenda bat bistaratzeko, eta ondoren hautatu zure teklatua.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5"><guibutton>Gehiago</guibutton> Leihotik teklatu bat hautatu ondoren,
-instalatzailea lehenengo teklatu hautapen leihora itzuliko da, eta
-zerrendatik teklatu bat aukeratu duzula irudituko da. Anomalia hau alde
-batera utzi dezakezu, eta instalazioarekin jarraitu, zure teklatua zerrenda
-osotik aukeratutakoa da.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="selectKeyboard-pa4">Ez-Latin karakteretan oinarritutako teklatua hautatzen baduzu, pantaila
-gehigarri bat agertuko da eskatuz nola nahiago duzu Latin eta Latin ez diren
-xedapen artean aldatzeko.</para>
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
+extra dialogue screen asking how you would prefer to switch between the
+Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/eu/selectKeyboardLive.xml b/docs/docs/stable/installer/eu/selectKeyboardLive.xml
index 3c7f01a4..fa4641e4 100644
--- a/docs/docs/stable/installer/eu/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/eu/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Aukeratu teklatua</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>Beharrezkoa izango da Mageian erabili nahi duzun teklatu-diseinua
-ezartzea. Lehenetsi bat zuk aurretik aukeratutako hizkuntzaren eta
-ordu-eremuaren arabera hautatzen da.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/eu/selectLanguage.xml b/docs/docs/stable/installer/eu/selectLanguage.xml
index 182426b2..8f7009a9 100644
--- a/docs/docs/stable/installer/eu/selectLanguage.xml
+++ b/docs/docs/stable/installer/eu/selectLanguage.xml
@@ -1,9 +1,33 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="eu" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
   
+
   
+
   
+
   
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 04 01, using barjac's text -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -12,41 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Aukeratu erabiltzeko hizkuntza bat</title>
   </info>
-  <para condition="classical">Zure hizkuntza gogokoena aukeratu zure kontinenteko zerrenda
-luzatzen. <application>Mageia</application> aukeraketa hori erabiliko da
-instalazioan zehar eta instalatutako sisteman.</para>
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
-  <para condition="classical">Zuretzat edo beste erabiltzaile batzuentzat hainbat hizkuntza instalaturik
-behar izanez gero <guibutton>Hizkuntza anitzeko</guibutton> botoia erabili
-orain gehitzeko. Instalakuntza amaitutakoan hizkuntzak gehitzea zailagoa
-izan daiteke.</para>
+
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
+
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
+
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
-  <warning condition="classical">
-    <para>Hizkuntza bat baino gehiago aukeratzen bada ere, lehen pantailan nahiago
-izandako zure hizkuntza lehena aukeratu behar duzu. Gainera, hainbat
-hizkuntzatako aukera pantailan markatuta egongo da.</para>
-  </warning>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
+
   <itemizedlist>
     <listitem condition="classical">
-      <para>Zure teklatu hizkuntza ez da zure gogoko hizkuntzaren berdina, orduan,
-komeni da, zure teklatuaren hizkuntza instalatzea.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
+
     <listitem>
-      <para>Mageia UTF-8 (Unicode) laguntza erabiltzen du lehenespenez.</para>
-      <para condition="classical">"Hainbat hizkuntza" pantailan ezgaitu daiteke zure hizkuntzarekin
-funtzionatzen ez duela baldin badakizu. UTF-8 Ezgaitzen baduzu, ez da
-eskuragarri egongo instalatutako inongo hizkuntzatarako.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
+
     <listitem>
-      <para>Zure sistemako hizkuntza alda dezakezu Mageia Kontrol Gunean instalazioa
-egin ondoren --> Sistema --> kudeatu zure sistemaren kokalekua.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eu/selectMouse.xml b/docs/docs/stable/installer/eu/selectMouse.xml
index 5c62bd08..e96e54b8 100644
--- a/docs/docs/stable/installer/eu/selectMouse.xml
+++ b/docs/docs/stable/installer/eu/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="eu">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Aukeratu sagua</title>
   </info>
@@ -7,26 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Ez bazaude pozik  zure saguak nola erantzuten duen, beste bat hemen hautatu
 ahal izango duzu.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Normalean, <guilabel>Unibertsal</guilabel> - <guilabel>Edozein PS/2 eta USB
-sagu</guilabel> aukera ona da.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Aukeratu <guilabel>Unibertsal</guilabel> - <guilabel>Behartu
-evdev</guilabel> lan egiten ez duten sei botoi edo gehiagoko saguaren
-botoiak konfiguratzen.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/eu/setupBootloader.xml b/docs/docs/stable/installer/eu/setupBootloader.xml
index ac884d3a..9616f1d9 100644
--- a/docs/docs/stable/installer/eu/setupBootloader.xml
+++ b/docs/docs/stable/installer/eu/setupBootloader.xml
@@ -1,227 +1,198 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="eu" xml:id="setupBootloader">
+  
+  
+  
+  
   
-
   
-
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Abio kargatzailearen aukera nagusiak</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
-
   <section>
-    <title>Abioko kargatzailearen interfazea</title>
-
-    <para>Lehenespenez, Mageia-k soilik darabil:</para>
-
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>Grub2 (enu grafikoarekin edo gabe) Legacy/MBR edo Legacy/GPT sistemarako</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi UEFI sistementzat.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-
-    <tip>
-      <para>The mageia menuak grafikoa politak ditu :)</para>
-    </tip>
-
-    <section>
-      <title>Grub2 Legacy/MBR eta Legacy/GPT sistemetan</title>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-
-      <para>Ez aldatu "Abio Gailua" zer egiten duzun benetan jakin gabe.</para>
-    </section>
-
-    <section>
-      <title>Grub2-efi UEFI sistemetan</title>
-
-      <para>UEFI sistema batekin, erabiltzaile interfazearen zertxobait ezberdinak dira,
-ezin duzu abioko kargatzailea aukeratu, Grub2-efi soilik dagoelako</para>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-
-      <para>Mageia zure ordenagailuan instalatutako sistema bakarra bada,
-instalatzaileak ESP (EFI sistema partizioa) sortuko du (Grub2-EFI)
-kargatzaileak jasotzeko. Zure ordenagailuan UEFI sistema eragile bat
-bazegoen aldez aurretik  (Windows 8 adibidez), Mageia instalatzaileak
-detektatuko ditu dauden Windows-ek sortutako ESP eta grub2-EFI-ra gehituko
-ditu. Hainbat ESP izatea posiblea izan arren, soilik bat izatea aholkatzen
-da eta aski dituzun sistema eragileetako kopurua edozein izanik ere.</para>
-
-      <para>Ez aldatu "Abio Gailua" zer egiten duzun benetan jakin gabe.</para>
-    </section>
-  </section>
-
-  <section>
-    <title xml:id="setupMageiaBootloader">Mageia abio kargatzailea erabiliz</title>
-
-    <para>Lehenespenez, zure sistemaren arabera, Mageia-k berri bat idazten du:</para>
-
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>GRUB2 abiarazlea MBR (Master Boot Record) zure lehen disko gogorrean edo
-BIOSen abioko partizioan.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then uncheck the box
-<guilabel>Probe Foreign OS</guilabel></para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
-
   <section>
-    <title>Existitzen den abio kargatzaile bat erabiliz</title>
-
-    <para>Zure Mageia sistema erabilea existitzen den abiarazlera gehitzeko prozedura
-zehatza eskuliburu honen esparrutik kanpo dago, baina normalean abio
-kargatzaile instalazioak antzeman eta gehitu beharko luke. Ikusi kasuko
-sistema eragilearen dokumentazioa.</para>
-  </section>
-
-  <section>
-    <title xml:id="setupChainLoading">Katearen karga erabiltzen</title>
-
-    <para>If you don't want a bootable Mageia, but to chain load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-
-  <section>
-    <title>Aukerak</title>
-
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>Lehen orria</title>
-
-      <para><itemizedlist>
-          <listitem>
-            <para><guilabel>Delay before booting the default image</guilabel>: This text box
-lets you set a delay in seconds before the default operating system is
-started up.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be asked at the boot
-time to select a booting entry or change settings. The username is "root"
-and the password is the one chosen here after.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Pasahitza</guilabel>: Testu-koadro honetan benetako pasahitza
-jartzen  da</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Pasahitza (berriz)</guilabel>: Idatzi berriro pasahitza eta DrakX
-lehen ezarritakoarekin bat etortzea egiaztatuko du.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Aurreratu</guilabel></para>
-
-            <itemizedlist>
-              <listitem>
-                <para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for the power management. It can save energy by
-stopping unused devices, this was the method used before APM. Unchecking it
+      <title>Abio kargatzailearen aukera nagusiak</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>SMP gaitu</guilabel>: Aukera honek prozesu anitzeko prozesadore
-simetrikoak gaitzen / desgaitzen ditu.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the
-operating system access to the Advanced Programmable Interrupt
-Controller. APIC devices permit more complex priority models, and Advanced
-IRQ (Interrupt Request)  management.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which
-manages all external interrupts for a specific processor in an SMP system.</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist></para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
-
     <section>
-      <title>Hurrengo orria</title>
-
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Lehenetsia:</guilabel> Sistema eragilea modu lehenetsian hasi da</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Erantsi:</guilabel> Aukera honek kernelaren informazioa pasatzera
-edo kernelak informazio gehiago emateko esaten dio abioan.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
-
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Aurreratu</guilabel><itemizedlist>
-              <listitem>
-                <para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-the boot menu will use. If you click the down triangle you will be offered
-other size and colour depth options.</para>
-              </listitem>
-
-              <listitem>
-                <para><emphasis role="bold">Ez ikutu ESP edo MBR</emphasis>: ikus goian <link
-linkend="setupChainLoading">Katearen karga erabiliz</link></para>
-              </listitem>
-            </itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Existitzen den abio kargatzaile bat erabiliz</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Gegitu edo Aldatu Abio Menuko Sarrera</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/setupBootloaderAddEntry.xml b/docs/docs/stable/installer/eu/setupBootloaderAddEntry.xml
index 3b0a87dc..7c255352 100644
--- a/docs/docs/stable/installer/eu/setupBootloaderAddEntry.xml
+++ b/docs/docs/stable/installer/eu/setupBootloaderAddEntry.xml
@@ -1,15 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns5="http://www.w3.org/2000/svg" version="5.0" xml:lang="eu" xml:id="setupBootloaderAddEntry">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="setupBootloaderAddEntry">
   
+
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
 
 Lebarhon 2016 12 16 Updated for Mageia 6-->
 <title xml:id="setupBootloaderAddEntry-ti1">Gegitu edo Aldatu Abio Menuko Sarrera</title>
   </info>
-  <para>Horretarako, editatu /boot/grub2/custom.cfg eskuz edo erabili
-grub-customizer softwarea (eskuragarri Mageia biltegietan).</para>
+
+  <para>To do this you need to manually edit /boot/grub2/custom.cfg or use the
+software <emphasis role="bold">grub-customizer</emphasis> tool instead
+(available in the Mageia repositories).</para>
+
   <note>
-    <para>Informazio gehiago lortzeko, ikus gure wikia: <link
+    <para>For more information, see: <link
 ns2:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
   </note>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/setupSCSI.xml b/docs/docs/stable/installer/eu/setupSCSI.xml
index 67bdb514..0ae87d05 100644
--- a/docs/docs/stable/installer/eu/setupSCSI.xml
+++ b/docs/docs/stable/installer/eu/setupSCSI.xml
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="setupSCSI" version="5.0" xml:lang="eu">
-
+<section version="5.0" xml:lang="eu" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">SCSI konfiguratu</title>
   </info>
 
   
+
   
+
   
+
   
-   
+
   
+
   
+
   
+
   
+
   
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- JohnR - edited 2012-03-03 -->
@@ -30,16 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata revision="1" fileref="dx2-setupSCSI.png"
-format="PNG" align="center" xml:id="setupSCSI-im1"></imagedata>
-</imageobject></mediaobject>
-
-  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX normalean zuzentasunez atzematen ditu disko gogorrak. SCSI
-kontrolagailu zahar batzuekin ezin izango du gidari zuzenak erabiltzeko
-detektatu eta huts egin dezake disko gogorra aitortu nahian.</para>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="setupSCSI-pa2">Horrela bada, eskuz kontatu behar izango dituzu DrakX-ekin dituzun SCSI
-disko(ak).</para>
+  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
+SCSI controllers it may be unable to determine the correct drivers to use
+and subsequently fail to recognise the drive.</para>
 
-  <para revision="3" xml:id="setupSCSI-pa3">Orduan DrakX kontrolatzile zuzena konfiguratzeko gai izan beharko litzateke.</para>
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
 </section>
diff --git a/docs/docs/stable/installer/eu/software.xml b/docs/docs/stable/installer/eu/software.xml
new file mode 100644
index 00000000..6137a4a8
--- /dev/null
+++ b/docs/docs/stable/installer/eu/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="eu" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/eu/soundConfig.xml b/docs/docs/stable/installer/eu/soundConfig.xml
index 916ab09c..9640efc7 100644
--- a/docs/docs/stable/installer/eu/soundConfig.xml
+++ b/docs/docs/stable/installer/eu/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="eu">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Soinu Konfiguraketa</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Pantaila honetan zure soinu txarteleko gidari Instalatzailearen izena ematen
-da, eta hau kontrolatzaile lehenetsia izango da lehenetsitako bat baduzu.</para>
+  
 
-  <para>Gidari lehenetsia ongi ibili beharko luke. Hala ere, instalazioa egin
-ondoren arazoak badaude, exekutatu <command>draksound</command> edo tresna
-hau abiarazi MCC-tik (Mageia Kontrol Gunea), <guilabel>Hardware</guilabel>
-etiketea auketatzen eta <guilabel>Soinua Konfiguratu</guilabel>n klik egiten
-pantailaren goiko eskuineko izkinan.</para>
+  
 
-  <para>Orduan, draksound-en  "Soinua Konfiguratu" tresnaren pantailan, egin klik
-<guibutton>Aurreratua</guibutton> eta <guibutton>Arazoen
-konponketa</guibutton>n arazoa nola konpondu buruzko aholku lagungarria
-aurkitzeko.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Aurreratua</title>
     </info>
 
-    <para>Klik egin <guibutton>Aurreratua</guibutton> pantaila honetan, instalazioan
-zehar, oso erabilgarria da han gidari lehenetsia ez bada, eta hainbat gidari
-eskuragarri badira, edo instalatzaileak okerreko kontrolatzailea aukeratu
-duela uste baduzu.</para>
-
-    <para>Kasu horretan beste kontrolatzaile bat <guibutton>Edozein gidari
-hautatu</guibutton>-n klik egin ondoren hautatu dezakezu.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/eu/takeOverHdConfirm.xml b/docs/docs/stable/installer/eu/takeOverHdConfirm.xml
index 9b6295fd..4dc5fd50 100644
--- a/docs/docs/stable/installer/eu/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/eu/takeOverHdConfirm.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="eu" xml:id="takeOverHdConfirm">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Baieztatzeko formateatu beharreko disko gogorra</title>
   </info>
@@ -7,7 +13,11 @@
   
 
   
+
   
+
+  
+
   
 
   
@@ -19,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition='live'> <imagedata
-fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
-fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="takeOverHdConfirm-pa1">Klik <guibutton>Aurreko</guibutton> ziur ez bazaude zure aukeraz.</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
+choice.</para>
+    </listitem>
 
-  <para revision="1" xml:id="takeOverHdConfirm-pa2">Klik <guibutton>Hurrengoa</guibutton> ziur bazaude eta partizio guztiak,
-sistema eragilea eta disko gogor horretako datu guztiak ezabatu nahi
-dituzula.</para>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/eu/testing.xml b/docs/docs/stable/installer/eu/testing.xml
index 499c9667..6d1ffdc7 100644
--- a/docs/docs/stable/installer/eu/testing.xml
+++ b/docs/docs/stable/installer/eu/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Mageia Live sistema gisa probatzen</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Mageia Live sistema gisa probatzen</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Live modua</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>Pantaila hau lortuko duzu  "Mageia Abiarazi" hautatu baduzu. Ezezkoa bada,
-"<link linkend="doPartitionDisks">Partizio</link> urratsa" lortuko duzu</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Hardwarea probatzen </title>
       </info>
 
-      <para>Live moduaren helburuetako bat Mageian hardware-a ondo kudeatuko dela
-probatzea da. Gailu guztiak gidari bat dutela egiazta dezakezu Mageia
-Kontrol Guneko Hardware atalean. Gailurik gaurkoagoak proba ditzakezu:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ Kontrol Guneko Hardware atalean. Gailurik gaurkoagoak proba ditzakezu:</para>
         </listitem>
 
         <listitem>
-          <para>txartel grafikoa: aurreko pantaila ikusten baduzu, dagoeneko dena ongi dago.</para>
-        </listitem>
-
-        <listitem>
-          <para>Web kamera:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ Kontrol Guneko Hardware atalean. Gailurik gaurkoagoak proba ditzakezu:</para>
         </listitem>
 
         <listitem>
-          <para>inprimagailua: konfiguratu eta probako orria inprimatu</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ Kontrol Guneko Hardware atalean. Gailurik gaurkoagoak proba ditzakezu:</para>
         </listitem>
       </itemizedlist>
 
-      <para>Guztia da zuretzat ona bada, instalaziora prozesa dezakezu. Hala ez bada,
-irten botoia sakatu dezakezu.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>Hemen egin dituzun konfigurazio ezarpenak instalaziorako mantenduko dira.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,14 +68,14 @@ irten botoia sakatu dezakezu.</para>
         <title xml:id="testing3-ti1">Instalaketa abiarazi</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>Mageia LiveCD edo Live disko gogorrean edo SSD disko DVD instalazioa
-abiarazteko, egin klik ikonoan "Hard Disk instalatu" on. Pantaila honetan,
-eta, ondoren, "<link linkend="doPartitionDisks">Partizio</link> urratsa"
-zuzeneko instalatzeko gisa jasoko duzu.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/eu/uninstall-Mageia.xml b/docs/docs/stable/installer/eu/uninstall-Mageia.xml
index f6a1cb8b..d4c25227 100644
--- a/docs/docs/stable/installer/eu/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/eu/uninstall-Mageia.xml
@@ -1,40 +1,48 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="eu">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="eu" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Mageia desinstalatzen</title>
   </info>
 
   
 
-  <section>
-    <title xml:id="uninstall-Mageia-ti2">Jarraibideak</title>
+  
 
-    <para>Mageia konbentzituko ez balizu edo ezin baduzu behar bezala instalatu, azken
-finean kendu nahi baduzu. Hori zure eskubidea da eta Mageiak ere aukera
-ematen dizu ezabatzeko. Hau ez da egia sistema eragile guztietan.</para>
+  <para>If Mageia didn't convince you or you can't install it correctly - in short
+you want get rid of it - that is your right and Mageia also gives you the
+possibility to uninstall. This is not true for every operating system.</para>
 
-    <para>Datuen babeskopiaren ondoren, berrabiatu zure Mageia DVD instalazioa eta
-hautatu Erreskate sistema, orduan, Leheneratu Windows abioko
-kargatzailea. Hurrengo abioan, zuk soilik Windows aukerarik gabe izango duzu
-zure sistema eragilea aukeratzeko.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-    <para>Windows-en Mageiak erabilitako partizio espazioa berreskuratzeko, sakatu
-<code>Hasi -> Kontrol-panela -> Administrazio-tresnak -> Ordenagailu
-Kudeaketa -> Biltegiratzea -> Disko Kudeaketa</code> partizio kudeaketan
-sartzeko. Mageiaren partizioa ezagutu egingo duzu
-<guilabel>ezezaguna</guilabel> etiketatu delako , eta, gainera, bere tamaina
-eta diskoan duen lekuaren arabera. Eskuinez klikatu partizio horietako
-bakoitzaren gainean eta hautatu <guibutton>Ezabatu</guibutton>. Espazioa
-libratuko da.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-    <para>Windows XP erabiltzen ari bazara, partizio berri bat sor dezakezu eta (FAT32
-edo NTFS)  formatua eman. Partizioa letra bat jasoko du.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
-    <para>Vista edo 7 badaukazu, aukera bat gehiago duzu, liberatutako espazioaren
-ezkerretara dagoen partizio existentea heda dezake. Beste partizio tresnak
-erabili daitezke, hala nola, GParted bezalakoak, Windows eta Linux-en
-eskuragarri daudenak. Beti bezala, partizioak aldatzean, kontu haundiz
-ibili, eta ziurtatu gauza garrantzitsu guztiak babestuta edukitzea.</para>
-  </section>
-</section>
\ No newline at end of file
+  <para>If you have Vista or 7, you have one more possibility, you can extend the
+existing partition that is at the left of the freed space. There are other
+partitioning tools that can be used, such as <emphasis
+role="bold">gparted</emphasis>, available for both Windows and Linux. As
+always, when changing partitions, be very careful to back up anything
+important to you.</para>
+</section>
diff --git a/docs/docs/stable/installer/eu/unused.xml b/docs/docs/stable/installer/eu/unused.xml
index 2ccd6a26..24fef0df 100644
--- a/docs/docs/stable/installer/eu/unused.xml
+++ b/docs/docs/stable/installer/eu/unused.xml
@@ -1,28 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="eu" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="eu">
   <info>
     <title xml:id="unused-ti1">Gorde edo ezabatu erabiltzen ez den materiala</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
 
-  <para>Urrats honetan, instalatzailearekin tokiko erabili gabeko paketeak eta
-erabili gabeko hardware paketeak bilatzen ditu. Gero proposatzen dizu
-ezabatzeko. Ideia ona da onartzeko, hardware ezberdinean instalazio bat
-exekutatzea pentsatu ezik.</para>
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>Hurrengo pausoa disko gogorrean fitxategiak kopiatzea da. Honek minutu
-batzuk hartzen ditu. Bukaeran, pantaila huts bat daukazu aldi baterako,
-normala da.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/fr/.directory b/docs/docs/stable/installer/fr/.directory
new file mode 100644
index 00000000..c84097a1
--- /dev/null
+++ b/docs/docs/stable/installer/fr/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2018,10,9,9,7,34
+Version=4
+ViewMode=1
diff --git a/docs/docs/stable/installer/fr/DrakLive-cover.xml b/docs/docs/stable/installer/fr/DrakLive-cover.xml
index b70e1697..00f63aa4 100644
--- a/docs/docs/stable/installer/fr/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/fr/DrakLive-cover.xml
@@ -1,77 +1,105 @@
-<?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="fr" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="fr" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Installation à partir du médium LIVE</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Janvier 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Installation à partir du médium LIVE</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">La documentation officielle de Mageia</para>
+      <para role="tagline">La documentation officielle de Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Les textes et les copies d'écrans de ce manuel sont disponibles sous la
+
+      <para>Les textes et les copies d'écrans de ce manuel sont disponibles sous la
 licence CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-            </para>
-            <para>Ce manuel a été réalisé avec l'aide de <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Ce manuel a été réalisé avec l'aide de <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> développé par <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>
-            </para>
-            <para>Il est rédigé par des bénévoles sur leur temps libre. Si vous désirez aider
+ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+      <para>Il est rédigé par des bénévoles sur leur temps libre. Si vous désirez aider
 à l'amélioration de ce manuel, veuillez contacter <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">l'Equipe de
-documentation</link>.</para> 
+documentation</link>.</para>
     </cover>
   </info>
+
   <article>
     <title>Installation à partir du médium LIVE</title>
-       <para><note>
-          <para>Lors d'une installation, seuls certains écrans présentés ci-après
+
+    <para><note>
+        <para>Lors d'une installation, seuls certains écrans présentés ci-après
 apparaissent, en fonction de votre matériel et des choix d'installation que
 vous faites.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/fr/DrakLive.xml b/docs/docs/stable/installer/fr/DrakLive.xml
index 3bc92659..8e5bd689 100644
--- a/docs/docs/stable/installer/fr/DrakLive.xml
+++ b/docs/docs/stable/installer/fr/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="fr" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="fr" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Installation à partir du médium LIVE</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Installation à partir du médium LIVE</title>
 
     <cover>
       <para><note>
@@ -17,10 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> développé par <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
 
-      <para>Il est rédigé par des bénévoles sur leur temps libre. Si vous désirez aider
-à l'amélioration de ce manuel, veuillez contacter <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">l'Equipe de
-documentation</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>
 
@@ -40,7 +54,12 @@ documentation</link>.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -50,17 +69,18 @@ documentation</link>.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/fr/DrakX-cover.xml b/docs/docs/stable/installer/fr/DrakX-cover.xml
index b997df5c..98897b79 100644
--- a/docs/docs/stable/installer/fr/DrakX-cover.xml
+++ b/docs/docs/stable/installer/fr/DrakX-cover.xml
@@ -1,116 +1,155 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="fr" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="fr" xml:id="Quick-Startup"
+      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 avec DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Février 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Février 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">La documentation officielle de Mageia</para>
+      <para role="tagline">La documentation officielle de Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>Les textes et les copies d'écrans de ce manuel sont disponibles sous la
+
+      <para>Les textes et les copies d'écrans de ce manuel sont disponibles sous la
 licence CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-	    </para>
-	    <para>Ce manuel a été réalisé avec l'aide de <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Ce manuel a été réalisé avec l'aide de <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> développé par <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>
-	    </para>
-            <para>Il est rédigé par des bénévoles sur leur temps libre. Si vous désirez aider
+ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+      <para>Il est rédigé par des bénévoles sur leur temps libre. Si vous désirez aider
 à l'amélioration de ce manuel, veuillez contacter <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">l'Equipe de
-documentation</link>.</para> 
+documentation</link>.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Installation avec DrakX</title>
-       <para><note>
-          <para>Lors d'une installation, seuls certains écrans présentés ci-après
+
+    <para><note>
+        <para>Lors d'une installation, seuls certains écrans présentés ci-après
 apparaissent, en fonction de votre matériel et des choix d'installation que
 vous faites.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -118,29 +157,32 @@ vous faites.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/fr/DrakX-inline.xml b/docs/docs/stable/installer/fr/DrakX-inline.xml
new file mode 100644
index 00000000..0f2b4204
--- /dev/null
+++ b/docs/docs/stable/installer/fr/DrakX-inline.xml
@@ -0,0 +1,139 @@
+<?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="fr" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Installation avec DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>Lors d'une installation, seuls certains écrans présentés ci-après
+apparaissent, en fonction de votre matériel et des choix d'installation que
+vous faites.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Les textes et les copies d'écrans de ce manuel sont disponibles sous la
+licence CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Ce manuel a été réalisé avec l'aide de <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> développé par <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+      <para>Il est rédigé par des bénévoles sur leur temps libre. Si vous désirez aider
+à l'amélioration de ce manuel, veuillez contacter <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">l'Equipe de
+documentation</link>.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/DrakX.xml b/docs/docs/stable/installer/fr/DrakX.xml
index 62e61839..1925b7bc 100644
--- a/docs/docs/stable/installer/fr/DrakX.xml
+++ b/docs/docs/stable/installer/fr/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="fr" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="fr" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Installation avec DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Installation avec DrakX</title>
 
     <cover>
       <para><note>
@@ -35,18 +73,6 @@ documentation</link>.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -61,23 +87,28 @@ documentation</link>.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -87,7 +118,10 @@ documentation</link>.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -95,19 +129,25 @@ documentation</link>.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -115,11 +155,15 @@ documentation</link>.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -138,4 +182,4 @@ documentation</link>.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/fr/SelectAndUseISOs2.xml b/docs/docs/stable/installer/fr/SelectAndUseISOs2.xml
index 7fae79d1..6a1822ca 100644
--- a/docs/docs/stable/installer/fr/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/fr/SelectAndUseISOs2.xml
@@ -1,38 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="fr" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Sélectionner et utiliser les ISOs</title>
   </info>
   <section>
     <title>Introduction</title>
     <para>Mageia est distribuée via des images ISO. Cette page vous aidera à choisir
 quelle image correspond le mieux à vos besoins.</para>
-    <para>Il existe deux familles de media :</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Installation classique : l'utilisation de ce média vous donne le maximum de
-flexibilité pour ce qui est à installer et à configurer. En particulier vous
-pouvez choisir quel environnement de bureau vous souhaitez installer. </para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>Média Live : cette option vous permet d'observer Mageia sans avoir à
-l'installer ni faire de modification à votre ordinateur. L'installation
-reste possible, mais avec beaucoup moins de choix que ce qu'offre
-l'installation classique</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>Ces médias sont très légers (moins de 100 Mo) et sont adaptés lorsque le
+débit est trop faible pour télécharger un DVD complet, si l'ordinateur n'a
+pas de lecteur de DVD ou s'il ne peut pas démarrer sur une clé USB.</para>
       </listitem>
     </itemizedlist>
-    <para>Des précisions sont fournies dans les sections suivantes.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Média</title>
     <section>
       <title>Définition</title>
-      <para>Ici, un médium (pluriel : média) est un fichier image ISO qui vous permet
-d'installer et/ou de mettre à jour Mageia, et par extension tout support
-physique (DVD, clé USB, ...) sur lequel le fichier ISO est copié.</para>
+      <para>Here, a medium (plural: media) is an ISO image file that allows you to
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>Vous pouvez trouver Mageia <link
 ns4:href="http://www.mageia.org/fr/downloads/">ici</link>.</para>
     </section>
@@ -42,25 +77,25 @@ ns4:href="http://www.mageia.org/fr/downloads/">ici</link>.</para>
         <title>Caractéristiques communes</title>
         <itemizedlist>
           <listitem>
-            <para>Ces images ISOs utilisent l'installeur classique appelé Drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
-            <para>Ils sont utilisés pour réaliser une nouvelle installation ou une mise à jour
-à partir d"une version installée précédemment.</para>
+            <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Des média différents pour les architectures 32 ou 64 bits.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Certains outils sont disponibles dans l'écran d'accueil : système de
-secours, test de mémoire, outil de détection de matériel.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Chaque DVD contient plusieurs environnements de bureau et plusieurs langues.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Vous aurez la possibilité durant l'installation d'ajouter des logiciels
-non-libres.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -71,23 +106,20 @@ non-libres.</para>
         <title>Caractéristiques communes</title>
         <itemizedlist>
           <listitem>
-            <para>Peut être utilisé pour tester le système d'exploitation Mageia sans avoir à
-l'installer. Peut être aussi utilisé pour une installation de Mageia.</para>
+            <para>Can be used to preview the Mageia operating system without having to install
+it</para>
           </listitem>
           <listitem>
-            <para>Chaque image ISO contient un seul environnement de bureau (Plasma, GNOME ou
-Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Des média différents pour les architectures 32 ou 64 bits.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Les ISO Live ne peuvent être utilisées que pour faire
-de nouvelles installations ; elles ne permettent pas pas de mettre à niveau
-une installation Mageia antérieure.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Ils contiennent des logiciels non-libres.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -95,13 +127,13 @@ une installation Mageia antérieure.</emphasis></para>
         <title>DVD Live Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Environnement de bureau Plasma uniquement</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Toutes les langues disponibles sont présentes.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Architecture 64 bits uniquement.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -109,13 +141,13 @@ une installation Mageia antérieure.</emphasis></para>
         <title>DVD Live GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>Environnement de bureau GNOME uniquement.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Toutes les langues disponibles sont présentes.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Architecture 64 bits uniquement.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -123,13 +155,13 @@ une installation Mageia antérieure.</emphasis></para>
         <title>DVD Live Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Environnement de bureau Xfce uniquement.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Toutes les langues disponibles sont présentes.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Architecture 32 bits et 64 bits.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -140,22 +172,10 @@ une installation Mageia antérieure.</emphasis></para>
         <title>Caractéristiques communes</title>
         <itemizedlist>
           <listitem>
-            <para>Ce sont des images ISO minimalistes ne contenant que ce qui est nécessaire
-pour démarrer l'installeur drakx, trouver drakx-installer-stage2 et d'autres
-paquets indispensables pour continuer et terminer l'installation. Ces
-paquets peuvent se trouver sur le disque dur de l'ordinateur, sur un
-périphérique de stockage, un réseau local ou sur Internet. </para>
-          </listitem>
-          <listitem>
-            <para>Ces médias sont très légers (moins de 100 Mo) et sont adaptés lorsque le
-débit est trop faible pour télécharger un DVD complet, si l'ordinateur n'a
-pas de lecteur de DVD ou s'il ne peut pas démarrer sur une clé USB.</para>
-          </listitem>
-          <listitem>
-            <para>Des média différents pour les architectures 32 ou 64 bits.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Les premières étapes sont en anglais uniquement.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -163,8 +183,8 @@ pas de lecteur de DVD ou s'il ne peut pas démarrer sur une clé USB.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contient uniquement des logiciels libres, pour les personnes qui préfèrent
-ne pas utiliser de logiciels non-libres.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -172,8 +192,7 @@ ne pas utiliser de logiciels non-libres.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contient des logiciels non-libres (essentiellement des pilotes, des
-codecs,...) pour les personnes qui en ont besoin.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -183,75 +202,89 @@ codecs,...) pour les personnes qui en ont besoin.</para>
     <title>Télécharger et vérifier les média</title>
     <section>
       <title>Téléchargement</title>
-      <para>Une fois choisi votre fichier ISO, vous pouvez le télécharger en utilisant
-un lien direct HTTP soit BitTorrent. Dans les deux cas, on vous fournira des
-informations, comme le miroir utilisé et une possibilité de le modifier si
-le débit est trop faible. Si vous choisissez le lien direct HTTP, vous
-pouvez également voir des explications relatives aux sommes de contrôle.</para>
+      <para>Once you have chosen your ISO file, you can download it using either http or
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum, sha1sum et sha512 sont des outils pour vérifier l'intégrité des
-images ISO. Utiliser uniquement l'un de ces outils. Conserver l'un d'entre
-eux <link linkend="integrity">pour un usage à venir</link>. La fenêtre
-suivante apparaît alors :</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Choisissez l'option Enregistrer le fichier, puis cliquez sur OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Vérification de l'intégrité du média téléchargé</title>
-      <para>Les sommes de contrôle mentionnées ci-dessus sont des empreintes numériques
-générées par un algorithme à partir du fichier à télécharger. Vous pouvez
-comparer la somme de contrôle du fichier ISO téléchargé à celle de l'ISO
-d'origine. Si les sommes de contrôles ne sont pas identiques, cela signifie
-que les données présentes dans l'ISO sont différentes. Si c'est le cas, vous
-devez télécharger le fichier à nouveau, ou tenter une réparation avec
-BitTorrent.</para>
+      <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>Pour générer une somme de contrôle pour l'ISO téléchargé, ouvrez un terminal
 (pas besoin d'être super-utilisateur), puis :</para>
       <itemizedlist>
         <listitem>
-          <para>Pour utiliser md5sum, tapez : <userinput>md5sum
-chemin/vers/le/fichier/image.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>Pour utiliser sha1sum, tapez : <userinput>sha1sum
-chemin/vers/le/fichier/image.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Exemple :</para>
+      <para>Exemple :</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>puis comparez le résultat (cela peut prendre un certain temps) avec la somme
-de contrôle fournie par Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Graver ou copier l'ISO</title>
-    <para>L'image ISO peut maintenant être gravée sur un CD/DVD ou copiée sur une clé
-USB. Il ne s'agit pas d'une copie de fichier ordinaire puisque c'est en fait
-un support de démarrage qui sera créé. </para>
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
     <section>
       <title>Graver l'image ISO sur un CD/DVD</title>
-      <para>Quel que soit le logiciel que vous utiliserez, assurez-vous que vous
-utilisez l'option <emphasis role="bold">graver une image</emphasis> : graver
-des <emphasis role="bold">données</emphasis> ou des <emphasis
-role="bold">fichiers</emphasis> n'est pas correct. Consultez <link
-ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">le wiki
-Mageia</link> pour plus d'information.</para>
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
+ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
+wiki</link> for more information.</para>
     </section>
     <section>
       <title>Copier l'image ISO sur une clé USB</title>
-      <para>Toutes les images ISO Mageia sont hybrides, ce qui signifie que vous pouvez
-les copier sur une clé USB puis utiliser celle-ci pour démarrer et installer
-le système.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>«Copier» une image sur un périphérique Flash détruira tout système de
-fichier déjà présent ; toutes les données seront détruites et la taille
-totale du périphérique sera réduite à la taille de l'image ISO.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>Afin de récupérer la capacité originelle de la clé USB, vous devez supprimer
-le partitionnement et reformater la clé.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Utiliser un outil graphique dans Mageia</title>
         <para>Vous pouvez utiliser un outil graphique tel que <link
@@ -262,8 +295,8 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <para>Vous pouvez essayer :</para>
         <itemizedlist>
           <listitem>
-            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> utilisant
-l'option « image ISO » ;</para>
+            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -272,7 +305,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Utiliser la ligne de commande avec le système GNU/Linux</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>Il est potentiellement « dangereux » de faire cela manuellement. Vous
 risquez d'écraser des données importantes si vous indiquez le mauvais
@@ -283,28 +316,28 @@ support cible.</para>
             <para>Ouvrir une console</para>
           </listitem>
           <listitem>
-            <para>Devenez Administrateur avec la commande <userinput>su -</userinput>
-(n'oubliez pas le - final)</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Brancher votre clé USB (ne pas la monter, ce qui veut également dire ne pas
-ouvrir une application ou un gestionnaire de fichiers qui pourrait y accéder
-ou la lire).</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Saisissez la commande <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Trouvez le nom de votre clé USB (par sa taille) ; par exemple, sur la
-capture d'écran ci-dessus, <code>/dev/sdb</code> désigne une clé USB de 8Go.</para>
-            <para>Vous pouvez également trouver le nom de votre clé USB à l'aide de la
-commande <code>dmesg</code> : vers la fin de cet exemple, le nom du
-périphérique commence par <emphasis>sd</emphasis>, et dans cet exemple il
-s'agit en fait de <emphasis>sdd</emphasis>. Sa taille est de 2Go.</para>
+            <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+            <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
@@ -325,22 +358,22 @@ s'agit en fait de <emphasis>sdd</emphasis>. Sa taille est de 2Go.</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Saisissez la commande : <emphasis role="bold">#<userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Où X=le nom de votre périphérique, par exemple : /dev/sdd</para>
-            <para>Exemple :<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>Il peut être utile de savoir que <emphasis role="bold">if</emphasis>
-signifie <emphasis role="bold">i</emphasis>nput <emphasis
-role="bold">f</emphasis>ile (fichier entrant), et que <emphasis
-role="bold">of</emphasis> signifie <emphasis role="bold">o</emphasis>utput
-<emphasis role="bold">f</emphasis>ile (fichier sortant)</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Saisissez la commande : # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>Le processus est terminé, vous pouvez à présent débrancher votre clé USB.</para>
@@ -349,4 +382,4 @@ role="bold">of</emphasis> signifie <emphasis role="bold">o</emphasis>utput
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/acceptLicense.xml b/docs/docs/stable/installer/fr/acceptLicense.xml
index 1fa2d7f6..00ac56f9 100644
--- a/docs/docs/stable/installer/fr/acceptLicense.xml
+++ b/docs/docs/stable/installer/fr/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Licence et Notes de version</title>
   </info>
 
@@ -46,20 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">Contrat de Licence</title>
     </info>
 
-    <para>Avant d'installer <application>Mageia,</application> veuillez lire les
-termes et conditions de la licence avec
-attention.<application></application></para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Ces termes et conditions s'appliquent à toute la distribution
-<application>Mageia </application>et doivent être acceptés avant de pouvoir
-continuer.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Pour continuer, sélectionnez <guilabel>Accepter</guilabel> puis cliquez sur
-<guibutton>Suivant</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Si vous décidez de ne pas accepter ces conditions, alors nous vous
-remercions de l'intérêt porté. Cliquer sur <guibutton>Quitter</guibutton>
-redémarrera votre ordinateur.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -77,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Des informations importantes concernant cette version de
-<application>Mageia</application> peuvent être consultées en cliquant sur le
-boutton <guibutton>Notes de version</guibutton>.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/addUser.xml b/docs/docs/stable/installer/fr/addUser.xml
index cfbccf2b..ee3ff1f3 100644
--- a/docs/docs/stable/installer/fr/addUser.xml
+++ b/docs/docs/stable/installer/fr/addUser.xml
@@ -1,35 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Gestion de l'Utilisateur et du Superutilisateur</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Définir le mot de passe Administrateur (Root) :</title>
     </info>
 
-    <para>Pour chaque installation de <application>Mageia</application>, il est
-conseillé de définir un mot de passe <emphasis
-role="bold">superutilisateur</emphasis> (ou administrateur), souvent appelé
-<emphasis>mot de passe root</emphasis> sous Linux. Pendant la saisie du mot
-de passe, le bouclier change de couleur du rouge vers le jaune puis le vert
-en fonction de l'efficacité du mot de passe. Un bouclier vert indique un mot
-de passe fort. Vous devez ressaisir le même mot de passe dans le champ juste
-en-dessous afin de vérifier qu'il n'y a pas d'erreur de saisie.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>Tous les mots de passe sont sensibles à la casse, et il est recommandé
-d'utiliser un mélange de lettres (majuscules et minuscules), de nombres et
-autres caractères dans votre mot de passe.</para>
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
 
@@ -38,44 +55,46 @@ autres caractères dans votre mot de passe.</para>
       <title xml:id="enterUser-ti3">Indiquer un utilisateur</title>
     </info>
 
-    <para>Ajoutez ici un utilisateur. Un simple utilisateur a moins de droits que le
-<emphasis role="bold">superutilisateur</emphasis> (root), mais suffisamment
-pour naviguer sur internet, utiliser les applications de bureautique, jouer
-et faire toutes autres choses habituellement réalisées par un utilisateur
-ordinaire avec son ordinateur.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Icône </guibutton>: en cliquant sur ce bouton, vous changerez
-l'icône de l'utilisateur.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Nom et prénom </guilabel>: inscrire ici le nom réel de
-l'utilisateur.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Identifiant de connexion</guilabel> : indiquez ici un identifiant
-de connexion ou bien DrakX transposera les nom et prénom pour en créer
-un. <emphasis>L'identifiant de connexion est sensible à la casse.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Mot de passe </guilabel>: Indiquez dans ce champ le mot de passe
-utilisateur. On retrouve à droite le bouclier qui indique la force du mot de
-passe. (voir aussi <xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Mot de passe (vérification)</guilabel> : Entrer à nouveau le mot
-de passe et Drakx va vérifier qu'il est bien identique au précédent.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Tout utilisateur ajouté lors de l'installation de Mageia disposera d'un
-répertoire /home protégé en lecture et en écriture (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>Vous pouvez ajouter, pendant l'installation, tous les utilisateurs
 supplémentaires jugés nécessaires à l'étape <emphasis>Résumé -
@@ -85,32 +104,31 @@ Configurer</emphasis>. Choisir <emphasis>Gestion des utilisateurs</emphasis> </p
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Gestion avancée de l'Utilisateur</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>L'option <guibutton>Avancé</guibutton> vous permettra de modifier davantage
-les paramètres pour l'utilisateur que vous avez ajouté.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell de démarrage </guilabel>: cette liste déroulante permet de
-choisir le shell utilisé par l'utilisateur créé dans l'écran précédent. Les
-choix possibles sont <emphasis role="bold">Bash</emphasis>, <emphasis
-role="bold">Dash</emphasis> et <emphasis role="bold">Sh</emphasis></para>
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>ID de l'Utilisateur </guilabel>: Indiquer ici <emphasis
-role="bold">l'ID de l'utilisateur</emphasis> créé dans l'écran
-précédent. Laissez vide en cas de doute.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>ID de groupe</guilabel>: Vous permet de spécifier un <emphasis
-role="bold">ID de groupe</emphasis>. Laissez vide en cas de doute.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/fr/add_supplemental_media.xml b/docs/docs/stable/installer/fr/add_supplemental_media.xml
index 676a2829..4a1a7d68 100644
--- a/docs/docs/stable/installer/fr/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/fr/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="fr">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Sélection de média (Configurer l'installation de média supplémentaires)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,44 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>Cet écran liste toutes les sources déjà disponibles. Il est possible
-d'ajouter des sources supplémentaires de paquetages, comme un disque optique
-ou une source distante. Le choix des sources détermine quels paquetages
-seront disponibles à l'installation lors des étapes suivantes.</para>
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Pour une source sur le réseau, deux étapes sont nécessaires :</para>
 
   <orderedlist>
     <listitem>
-      <para>Choix et activation du réseau, s'il ne l'est pas déjà.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
-      <para>Sélectionner un miroir ou spécifier une URL (toute première
-entrée). Sélectionner un miroir vous donne la possibilité de choisir parmi
-tous les dépôts gérés par Mageia, tels que le <emphasis
-role="bold">Nonfree</emphasis>, le <emphasis role="bold">Tainted</emphasis>
-et le <emphasis role="bold">Updates</emphasis>.  Avec l'URL, vous pouvez
-désigner un dépôt spécifique de votre propre réseau NFS.</para>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>Si vous mettez à jour un système 64 bits susceptible de contenir des
-paquetages 32 bits, il est recommandé d'utiliser cet écran pour ajouter un
-miroir en ligne, en cochant l'un des protocoles Réseau ci-dessous. L'image
-ISO du DVD 64 bits contient uniquement des paquetages 64 bits et "noarch",
-il ne pourra pas mettre à jour des paquetages 32 bits. Cependant, après
-avoir ajouté un miroir en ligne, l'installeur y trouvera les paquetages 32
-bits nécessaires.</para>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/ask_mntpoint_s.xml b/docs/docs/stable/installer/fr/ask_mntpoint_s.xml
index a1082105..dfafb80f 100644
--- a/docs/docs/stable/installer/fr/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/fr/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="fr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Choix des points de montage</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,45 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Sont présentées ici les partitions Linux qui ont été trouvées sur votre
-ordinateur. Si vous n'êtes pas d'accord avec les suggestions de
-<application>DrakX</application>, il est possible de modifier les points de
-montage.</para>
-
-  <note>
-    <para>Quoi que vous changiez, assurez-vous de toujours avoir au moins UNE
-partition <literal>/</literal> (appelée la Racine).</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Chaque partition est présentée comme suit : <emphasis
-role="bold">"Périphérique" ("Capacité", "Point de montage",
-"Type").</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Périphérique</emphasis>, est constitué de : <emphasis
-role="bold">disque dur</emphasis>, [<emphasis role="bold">nom du disque
-dur</emphasis> (lettre)], <emphasis role="bold">numéro de
-partition</emphasis> (par exemple, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>Si vous avez plusieurs partitions, vous pouvez choisir différents points de
-montage dans la liste déroulante, tels que <literal>/</literal>,
-<literal>/home</literal> et <literal>/var</literal>. Il est même possible de
-créer ses propres points de montage, par exemple <literal>/video</literal>
-pour une partition de stockage des films, ou
-<literal>/cauldron-home</literal> pour la partition <literal>/home</literal>
-d'une installation de cauldron.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -81,13 +82,17 @@ vide le champ point de montage.</para>
   </itemizedlist>
 
   <warning>
-    <para>Si vous ne savez pas quoi choisir, cliquez sur
-<guibutton>Précédent</guibutton> et cochez <guilabel>Partitionnement
-personnalisé du disque</guilabel>. Dans ce mode, vous pourrez cliquer sur
-une partition pour connaître son type et sa taille.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Vous êtes sûr que les points de montage sont corrects ? Alors cliquez sur
-<guibutton>Suivant</guibutton>, et décidez si vous désirez seulement
-formater la(es) partition(s) suggérée(s) par DrakX, ou plus.</para>
-</section>
\ No newline at end of file
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/fr/bestTime.xml b/docs/docs/stable/installer/fr/bestTime.xml
index 4d4347cf..5cf5b7a1 100644
--- a/docs/docs/stable/installer/fr/bestTime.xml
+++ b/docs/docs/stable/installer/fr/bestTime.xml
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="fr" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="fr" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Réglages de l'heure</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>Dans cette étape, vous devez choisir sur quelle heure l'horloge interne doit
-être reglée, l'heure locale ou l'heure UTC.</para>
-
-  <para>Dans l'onglet Avancé, vous trouverez plus d'options sur le réglage de
-l'heure.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/bootLive.xml b/docs/docs/stable/installer/fr/bootLive.xml
index 48b185a3..d8e47452 100644
--- a/docs/docs/stable/installer/fr/bootLive.xml
+++ b/docs/docs/stable/installer/fr/bootLive.xml
@@ -1,33 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="fr"><info><title xml:id="bootLive-ti1">Démarrer Mageia comme système Live</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Démarrer</title></info><section><info><title xml:id="bootLive11-ti1">À partir d'un disque dur</title></info><para>Vous pouvez démarrer directement depuis le média habituellement utilisé pour
-graver vos images (CD-ROM, DVD-ROM...). Vous avez juste besoin de l'insérer
-dans votre lecteur CD/DVD pour que le chargeur d'amorçage démarre
-l'installation automatiquement après le redémarrage de l'ordinateur. Si cela
-n'arrive pas, vous devrez peut-être reconfigurer votre BIOS ou appuyer sur
-une touche (ex : F8) afin de choisir le périphérique sur lequel l'ordinateur
-devra démarrer.</para><para>En fonction du matériel dont vous disposez, et de la manière dont il est
-configuré, vous obtenez l'un ou l'autre des deux écrans ci-dessous.</para></section><section><info><title xml:id="bootLive12-ti1">A partir d'un périphérique USB</title></info><para>Vous pouvez démarrer depuis le périphérique USB sur lequel se trouve votre
-image ISO. Selon les paramètres de votre BIOS, l'ordinateur démarrera
-peut-être directement sur le périphérique USB déjà inséré dans le port. Si
-cela n'arrive pas, vous devrez peut-être reconfigurer votre BIOS ou appuyer
-sur une touche (ex : F8) afin de choisir le périphérique sur lequel
-l'ordinateur devra démarrer.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">Dans le mode Bios, csm ou legacy</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Premier écran lors du démarrage en mode BIOS</para></caption></mediaobject><para>Dans le menu du milieu, vous avez le choix entre trois actions : </para><itemizedlist><listitem><para>Démarrer Mageia : cela signifie que Mageia 5 se lancera à partir du media
-connecté (CD/DVD ou clé USB), sans copier quoi que ce soit sur le disque
-dur, ce qui se traduira par un système très lent. Une fois le démarrage
-réalisé, vous pourrez procéder à l'installation sur le disque dur.</para></listitem><listitem><para>Installer Mageia : ce choix installera Mageia directement sur votre disque
-dur.</para></listitem><listitem><para>Démarrer à partir du disque dur : ce choix vous permet de démarrer sur le
-disque dur, comme habituellement, lorsque aucun media (CD/DVD ou clé USB)
-n'est connecté. (Ne fonctionne pas avec Mageia 5).</para></listitem></itemizedlist><para>Dans le menu inférieur, vous disposez des options de démarrage :</para><itemizedlist><listitem><para>F1 - Aide. Explique les options "splash", "apm", "acpi" et "Ide"</para></listitem><listitem><para>F2 - Langue. Sélectionner la langue à afficher sur les écrans.</para></listitem><listitem><para>F3 - Résolution de l'écran. Sélectionner entre texte, 640x400, 800x600,
-1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom ou autre. Normalement, l'installation se déroule à
-partir du medium inséré. Vous pouvez sélectionner d'autres sources
-d'installation, telles que les serveurs FTP ou NFS. Si l'installation est
-réalisée sur le réseau avec un serveur SLP, sélectionner l'une des sources
-disponible sur le serveur avec cette option.</para></listitem><listitem><para>F5 - Pilote. Oui ou Non. Le système sait si un disque supplémentaire
-contient une mise à jour de pilote et demandera son insertion lors du
-processus d'installation.</para></listitem><listitem><para>F6 - Options du Noyau. C'est un moyen pour préciser les options liées à
-votre matériel et aux pilotes à utiliser.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">En mode UEFI</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Premier écran lors du démarrage à partir du disque dur sur les systèmes UEFI</para></caption></mediaobject><para>Vous avez le choix entre lancer Mageia en mode Live (premier choix) ou
-effectuer son installation (second choix).</para><para>Si vous avez démarré à partrir d'une clé USB, vous disposez de deux lignes
-supplémentaires qui sont des copies des lignes précédentes, suffixées par
-"USB". Vous devez les sélectionner.</para><para>Dans chaque cas, les premières étapes seront les mêmes pour sélectionner la
-langue, le fuseau horaire et le clavier, puis le processus diffère ensuite,
-avec <link linkend="testing">des étapes complémentaires en mode Live</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Démarrer Mageia comme système Live</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Démarrer</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">Dans le mode Bios, csm ou legacy</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Premier écran lors du démarrage en mode BIOS</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">En mode UEFI</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/fr/chooseDesktop.xml b/docs/docs/stable/installer/fr/chooseDesktop.xml
index 4935b90e..847b189a 100644
--- a/docs/docs/stable/installer/fr/chooseDesktop.xml
+++ b/docs/docs/stable/installer/fr/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Sélection du bureau</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Sélection du bureau</title>
   </info>
 
   
 
-  <para>En fonction des sélections faites ici, des écrans supplémentaires peuvent
-apparaître pour préciser vos choix.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>Après l'(es) étape(s) de sélection, un diaporama s'affiche pendant
-l'installation des paquetages. Il peut être désactivé en cliquant sur le
-bouton <guilabel>Détails</guilabel></para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choisissez entre les bureaux <application>KDE</application><emphasis
-role="bold">Plasma</emphasis> ou <application>GNOME</application>. Tous deux
-incluent en ensemble d'applications et d'outils utiles. Cochez
-<guilabel>Personnaliser</guilabel>si vous souhaitez n'utiliser aucun (ou
-utiliser les 2), ou si vous souhaitez modifier les choix logiciels par
-défault pour ces bureaux. Le bureau <application>LXDE</application>par
-exemple, est plus léger que les deux précédents, moins tape-à-l'œil et avec
-moins de paquetages installés par défaut.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/fr/choosePackageGroups.xml b/docs/docs/stable/installer/fr/choosePackageGroups.xml
index 9512e4bf..9773fd8f 100644
--- a/docs/docs/stable/installer/fr/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/fr/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Sélection du groupe de paquetages</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/fr/choosePackagesTree.xml b/docs/docs/stable/installer/fr/choosePackagesTree.xml
index 2218ee91..a6a76817 100644
--- a/docs/docs/stable/installer/fr/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/fr/choosePackagesTree.xml
@@ -1,22 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="fr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="fr">
   <info>
     <title xml:id="choosePackagesTree-ti1">Choisir individuellement des paquetages</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Il est possible ici d'ajouter n'importe quel paquetage supplémentaire pour
 personnaliser l'installation.</para>
 
-  <para>Après avoir fait son choix, cliquer sur <guibutton>l'icône de la
-disquette</guibutton> en bas de la page pour enregistrer le choix des
-paquetages (il est aussi possible de l'enregistrer sur une clé USB).
-Utiliser alors ce fichier pour réaliser l'installation des mêmes paquetages
-sur un autre système, en cliquant sur la même icône pendant l'installation
-et en choisissant de charger le fichier.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/configureServices.xml b/docs/docs/stable/installer/fr/configureServices.xml
index 6b21a3c6..7c84e845 100644
--- a/docs/docs/stable/installer/fr/configureServices.xml
+++ b/docs/docs/stable/installer/fr/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="fr" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Configurer les Services</title>
   </info>
@@ -7,22 +7,32 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Sélectionnez ici les services à démarrer automatiquement lors du démarrage
 du système.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Cliquez sur un triangle pour étendre un groupe à tous les services
-pertinents.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">Les paramètres choisis par DrakX sont généralement corrects.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">Si un service est mis en surbrillance, des informations à son sujet sont
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Si un service est mis en surbrillance, des informations à son sujet sont
 disponibles dans l'infobulle en dessous.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Ne modifier quelque chose qu'avec la certitude de bien faire.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/configureTimezoneUTC.xml b/docs/docs/stable/installer/fr/configureTimezoneUTC.xml
index b052d62f..fcfb1255 100644
--- a/docs/docs/stable/installer/fr/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/fr/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="fr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="fr">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Configurer le fuseau horaire</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Indiquez votre fuseau horaire en choisissant le pays ou la ville la plus
-proche dans le même fuseau.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">À l'écran suivant, vous pourrez choisir de régler l'horloge système sur
 l'heure locale ou sur GMT, aussi appelée UTC.</para>
diff --git a/docs/docs/stable/installer/fr/configureX_card_list.xml b/docs/docs/stable/installer/fr/configureX_card_list.xml
index e1186a71..bd28da56 100644
--- a/docs/docs/stable/installer/fr/configureX_card_list.xml
+++ b/docs/docs/stable/installer/fr/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="fr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Choisissez un serveur d'affichage (serveur X)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>L'outil d'installation a une base de données assez complète des cartes
 graphiques et identifie en général correctement votre matériel.</para>
@@ -29,33 +42,34 @@ graphiques et identifie en général correctement votre matériel.</para>
   <para>Si l'installateur n'a pas détecté correctement votre carte graphique et si
 vous connaissez celle-ci, vous pouvez le sélectionner dans l'arborescence : <itemizedlist>
       <listitem>
-        <para>le vendeur</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>nom de la carte graphique</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>et le type de carte.</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
-  <para>Si vous ne trouvez pas votre carte dans la liste des fabricants (parce
-qu'elle n'est pas encore dans la base, ou qu'elle est trop ancienne), vous
-trouverez peut-être un pilote convenable dans la catégorie <emphasis
-role="bold">Xorg</emphasis>, utilisez <emphasis role="bold">vesa</emphasis>,
-qui fournit les fonctionnalités de base.</para>
-
-  <para>Soyez conscient que vous n'aurez accès qu'à la <emphasis role="bold">ligne
-de commande</emphasis>si vous choisissez un pilote incompatible.</para>
+  <para>If you cannot find your card in the vendor lists (because it's not yet in
+the database or it's an older card) you may find a suitable driver in the
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Certains fabricants de carte vidéo fournissent des pilotes propriétaires
-pour Linux, qui ne peuvent être disponibles que dans le dépôt <emphasis
-role="bold">Nonfree</emphasis>, ou même parfois uniquement sur leur site
-internet.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
-  <para>Le dépôt <emphasis role="bold">Nonfree</emphasis> doit être explicitement
-activé pour y accéder. Si vous ne l'avez pas activé lors de l'installation,
-vous pourrez le faire après votre premier redémarrage.</para>
-</section>
\ No newline at end of file
+  <para>Some video card manufacturers provide proprietary drivers for Linux which
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/fr/configureX_chooser.xml b/docs/docs/stable/installer/fr/configureX_chooser.xml
index ef130bb6..4e5abba9 100644
--- a/docs/docs/stable/installer/fr/configureX_chooser.xml
+++ b/docs/docs/stable/installer/fr/configureX_chooser.xml
@@ -1,64 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="fr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Configuration de X, de la carte graphique et du moniteur</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
-
-  <para revision="1" xml:id="configureX_chooser-pa1">Quel que soit l'environnement graphique (aussi nommé Bureau) choisi pour
-cette installation de <application>Mageia</application>, tous sont basés sur
-une interface utilisateur graphique appelée <acronym>X-Window</acronym>, ou
-simplement <acronym>X</acronym>. Aussi, pour permettre à
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym>ou tout autre bureau de fonctionner correctement, les
-paramètres de <acronym>X</acronym> suivants doivent être
-corrects. Choisissez les bons paramètres s'ils n'ont pas été sélectionnés
-par défaut, ou modifiez ces deniers s'ils vous semblent incorrects.</para>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
+
+  <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Carte Graphique </guibutton></emphasis>: Si besoin,
-choisir la carte dans la liste.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Moniteur</guibutton></emphasis>: Choisissez
-<guilabel>Plug'n Play</guilabel> lorsque c'est possible, ou dans la liste
-des <guilabel>Vendeurs</guilabel> ou encore celle des
-<guilabel>Génériques</guilabel>. Choisissez
-<guilabel>Personnalisé</guilabel> Si vous souhaitez spécifier les taux de
-rafraîchissement horizontaux et verticaux de votre moniteur.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Le moniteur peut être endommagé par des taux de rafraîchissement incorrects.</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Résolution</guibutton></emphasis>: Indiquez ici la
-résolution et la profondeur de couleurs de votre moniteur.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: Ce bouton test n'apparaît
-pas toujours pendant l'installation. S'il est présent, et que vous testez
-vos réglages, le système devrait vous demander si vos paramètres sont
-corrects. Si vous répondez <emphasis role="bold">oui</emphasis>, ils seront
-conservés. Si la question n'apparaît pas, vous retournerez à l'écran de
-configuration et pourrez modifier vos réglages jusqu'à ce que le test soit
-concluant. Si le bouton de test n'est pas disponible, redoublez de
-précautions dans le choix des paramètres.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Options</guibutton></emphasis>: Choisir ici de valider
-ou d'invalider différentes options.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/fr/configureX_monitor.xml b/docs/docs/stable/installer/fr/configureX_monitor.xml
index 512fff7c..1298122c 100644
--- a/docs/docs/stable/installer/fr/configureX_monitor.xml
+++ b/docs/docs/stable/installer/fr/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="fr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,67 +23,84 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Choisissez un moniteur</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX comporte une importante base de données de moniteurs et en général,
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX comporte une importante base de données de moniteurs et en général,
 votre matériel est bien identifié.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Le choix d'un moniteur avec des caractéristiques
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Le choix d'un moniteur avec des caractéristiques
 différentes du vôtre peut endommager votre écran ou votre carte
 graphique. Soyez prudent dans les paramètres que vous testez.</emphasis>En
 cas de doute, consultez la documentation de votre moniteur. </para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Personnalisé</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Cette option vous permet de spécifier deux paramètres critiques, la
-fréquence de rafraichissement vertical et la fréquence de synchronisation
-horizontale. La fréquence de rafraichissement vertical détermine à quelle
-fréquence l'écran est rafraîchi, tandis que la fréquence de synchronisation
-horizontale détermine la fréquence à laquelle les lignes sont affichées.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">Il est <emphasis role="bold">très important</emphasis> que les
+        <para revision="1" xml:id="configureX_monitor-pa4">Il est <emphasis role="bold">très important</emphasis> que les
 spécifications que vous donnez ne soient pas au-delà des capacités de votre
 moniteur : vous pourriez endommager votre moniteur. En cas de doute, vous
 devez choisir une configuration conservatrice et consulter la documentation
 de votre matériel.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">C'est l'option par défaut. Le système essaye de déterminer le type de
-moniteur à partir de la base de données.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Vendeur</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">Si le système n'a pas déterminé correctement votre matériel et si vous
-connaissez ses références, vous pouvez le sélectionner dans l'arborescence
-en sélectionnant dans l'ordre : <itemizedlist>
       <listitem>
-        <para>le vendeur</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>le nom du fabricant du moniteur</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>la description du moniteur.</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Si le système n'a pas déterminé correctement votre matériel et si vous
+connaissez ses références, vous pouvez le sélectionner dans l'arborescence
+en sélectionnant dans l'ordre :</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Générique</emphasis></para>
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">La sélection de ce groupe permet de choisir parmi 30 configurations
-d'affichage telles que le 1024x768 @ 60Hz et comprend les écrans plats tels
-qu'utilisés par les portables. C'est souvent un choix adapté lorsque vous
-utilisez le pilote <emphasis role="bold">Vesa</emphasis> et que votre carte
-graphique ne peut pas être détectée automatiquement. Encore une fois, soyez
-prudent dans vos choix.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
+
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/fr/diskPartitioning.xml b/docs/docs/stable/installer/fr/diskPartitioning.xml
new file mode 100644
index 00000000..a71213a9
--- /dev/null
+++ b/docs/docs/stable/installer/fr/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="fr" version="5.0" xml:lang="fr">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/diskdrake.xml b/docs/docs/stable/installer/fr/diskdrake.xml
index 31ee3352..9e642ca5 100644
--- a/docs/docs/stable/installer/fr/diskdrake.xml
+++ b/docs/docs/stable/installer/fr/diskdrake.xml
@@ -1,70 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Partitionnement personnalisé du disque avec DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">Si vous souhaitez chiffrer la partition <emphasis role="bold">/</emphasis>
-il faut d'abord s'assurer que la partition <emphasis
-role="bold">/boot</emphasis> est séparée des autres. La partition <emphasis
-role="bold">/boot</emphasis> NE doit PAS être chiffrée, sinon le système ne
-pourra pas s'amorcer.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Ajuster la structure de votre disque dur ici. Vous pouvez supprimer ou créer
-des partitions, modifier le système de fichiers d'une partition, sa taille
-et même visualiser ce qu'il y a à l'intérieur avant de commencer les
-modifications.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">En haut, il y a un onglet pour chaque disque dur détecté (ou d'autres
-supports de stockage comme une clé USB). Sur la capture d'écran ci-dessus,
-il y a deux disques disponibles : <emphasis role="bold">sda</emphasis> et
-<emphasis role="bold">dsb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa5" revision="1">Soyez prudent avec l'option <guibutton>Efacez tout</guibutton>, ne
-l'utilisez que si vous êtes sûr que vous voulez effacer TOUTES les
-partitions sur le périphérique sélectionné.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6" revision="1">Pour toutes les autres actions : Cliquer d'abord sur la partition
-souhaitée.. Ensuite, l'explorer, choisir un type de système de fichiers et
-un point de montage, la redimensionner ou la supprimer. Le <guibutton>Mode
-expert</guibutton>) fournit d'autres options telles l'ajout d'un nom de
-partition ou le choix d'un type.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continuer jusqu'à ce que tout soit satisfaisant.</para>
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Cliquer sur <guibutton>Terminer</guibutton> quand tout est correct..</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>Si vous installez Mageia sur un système UEFI, vérifiez qu'une partition
-système EFI  (ESP pour EFI System Partition) est présente et correctement
-montée sur /boot/EFI (voir ci-dessous) </para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>Si vous installez Mageia sur un système Legacy/GPT, vérifiez qu'une
-partition d'amorçage en mode BIOS (BIOS boot partition) est présente et
-possède le type requis.</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/fr/doPartitionDisks.xml b/docs/docs/stable/installer/fr/doPartitionDisks.xml
index b374f830..0ecf7d40 100644
--- a/docs/docs/stable/installer/fr/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/fr/doPartitionDisks.xml
@@ -1,54 +1,95 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
+
+  
 
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Partitionnement</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">Cet écran présente le contenu du(des) disque(s) dur(s) et les propositions
-faites par DrakX pour l'endroit où installer
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">Les options proposées dans la liste ci-dessous varient en fonction  de
-l'agencement  et du contenu de chaque disque dur en particulier.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Utiliser les partitions existantes</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">Si cette option est disponible, alors des partitions compatibles avec Linux
+      <para revision="1" xml:id="doPartitionDisks-pa5">Si cette option est disponible, alors des partitions compatibles avec Linux
 ont été trouvées et sont utilisables pour l'installation de Mageia.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Utiliser l'espace libre</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">Si le disque dur comporte de l'espace inutilisé, alors cette option
+      <para revision="1" xml:id="doPartitionDisks-pa7">Si le disque dur comporte de l'espace inutilisé, alors cette option
 l'utilisera pour l'installation de Mageia.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Utiliser l'espace libre sur une partition Microsoft Windows</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
+
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
+
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">Si une partition Windows existante comporte de l'espace inutilisé,
-l'installateur propose de l'utiliser.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">Cela peut être une façon pratique de faire de la place pour l'installation
-de Mageia, mais il s'agit d'une opération risquée, vous devriez donc vous
-assurer de posséder une sauvegarde de tous les fichiers importants.</para>
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Noter que cela impose de rétrécir la partition Windows. La partition doit
 être "intègre", signifiant que Windows doit s'être correctement arrêté lors
 de sa dernière utilisation. La partition doit avoir été défragmentée
@@ -56,123 +97,120 @@ de sa dernière utilisation. La partition doit avoir été défragmentée
 partition aient été déplacés en dehors de la zone à utiliser. Il est
 fortement recommandé de sauvegarder ses données personnelles importantes au
 préalable.</para>
+      </important>
+    </listitem>
 
-        <para>Avec cette option, l'installateur affiche la partition Windows restante en
-bleu clair et la future partition Mageia en bleu foncé, avec leurs tailles
-prévues juste en dessous. Vous avez la possibilité d'adapter ces tailles en
-cliquant et en déplaçant la limite entre les deux partitions. Voir la
-capture d'écran ci-dessous.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Effacer et utiliser le disque tout entier</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa13" revision="1">Cette option attribue tout l'espace disque à Mageia.</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">Ceci vous donne le contrôle complet sur la localisation de votre
+installation sur le(s)  disque(s).</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Attention ! Cela effacera TOUTES les données sur le disque
-sélectionné. Faites attention !</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>Si l'espace total disponible est supérieur à 50 Go, alors trois partitions
+sont créées. </para>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">Si vous avez l'intention d'utiliser une partie du disque pour autre chose,
-ou bien des données déjà présentes sur le disque ne doivent pas être
-perdues, alors ne pas utiliser cette option.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Partitionnement de disque personnalisé</para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">Ceci vous donne le contrôle complet sur la localisation de votre
-installation sur le(s)  disque(s).</para>
-      </listitem>
-    </itemizedlist></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Dimensionnement de partition :</emphasis></para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para>Si vous n'utilisez pas l'option <emphasis role="bold">Partitionnement de
-disque personnalisé</emphasis>, l'installateur allouera l'espace disponible
-selon les règles suivantes :</para>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>Si l'espace total disponible est inférieur à 50 Go, une seule partition est
-créée. Ce sera le répertoire <emphasis role="bold">/</emphasis> (racine).</para>
-      </listitem>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-      <listitem>
-        <para>Si l'espace total disponible est supérieur à 50 Go, alors trois partitions
-sont créées. </para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19ème de l'espace total disponible est alloué au répertoire <emphasis
-role="bold">/</emphasis> (root), jusqu'à un maximum de 50 Go.</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19ème est alloué au SWAP avec un maximum de 4 Go.</para>
-          </listitem>
-
-          <listitem>
-            <para>le reste (au moins 12/19) est alloué à la partition <emphasis
-role="bold">/home</emphasis>.</para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
-
-  <para>Cela signifie que pour un espace disponible de 160 Go et plus, l'installeur
-créera trois partitions : 50 Go pour <emphasis role="bold">/</emphasis>, 4
-Go pour le <emphasis role="bold">SWAP</emphasis> et le reste pour <emphasis
-role="bold">/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para>Si vous utilisez un système UEFI, l'ESP (partition système EFI) sera
-détectée automatiquement, ou créée si elle n'existe pas encore, et montée
-sur /boot/EFI. L'option <emphasis role="bold">Partitionnement de disque
-personnalisé</emphasis> est la seule qui permet de vérifier si l'opération a
-été effectuée correctement </para>
+    <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>Si vous utilisez un système en mode Legacy (parfois nommé CSM ou BIOS) avec
-un disque GPT, vous devez créer une partition d'amorçage BIOS (Bios boot
-partition) si elle n'existe pas déjà. C'est une partition d'environ 1 Mo
-sans point de montage. Choisir <xref linkend="diskdrake"/>pour pouvoir la
-créer avec l'installeur, comme n'importe quelle autre partition, simplement
-sélectionner <emphasis role="bold">BIOS boot partition</emphasis> comme type
-de système de fichiers.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para>Certains nouveaux disques utilisent maintenant des secteurs logiques de 4096
-octets, au lieu des traditionnels 512 octets.  En raison d'un manque de
-matériel disponible, l'outil de partitionnement utilisé par l'installateur
-n'a pas pu être testé avec de tels disques.  Des disques SSD utilisent aussi
-maintenant des blocs d'effacement de plus de 1Mo.  Nous vous suggérons de
-partitionner votre disque au préalable à l'aide d'un outil de
-partitionnement tiers tel que <emphasis role="bold">gparted</emphasis>, et
-d'utiliser la configuration suivante :</para>
+  <important>
+    <para>Some newer drives are now using 4096 byte logical sectors, instead of the
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
 
-    <para><emphasis role="bold">Alignement </emphasis> = Mo</para>
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Espace disque initial (Mo)</emphasis> = 2</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Assurez vous aussi que toutes les partitions sont créées avec un nombre pair
 de Mo.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/fr/exitInstall.xml b/docs/docs/stable/installer/fr/exitInstall.xml
index 4a9c39f6..46b515bf 100644
--- a/docs/docs/stable/installer/fr/exitInstall.xml
+++ b/docs/docs/stable/installer/fr/exitInstall.xml
@@ -5,24 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">L'installation et la configuration de <application>Mageia</application> sont
-terminées et il est maintenant possible d'enlever le medium d'installation
-et de redémarrer l'ordinateur.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">Après le redémarrage, vous pourrez choisir entre plusieurs systèmes
-d'exploitations (s'il y en a plusieurs installés) sur l'écran du chargeur de
-démarrage.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">Si les réglages du chargeur de démarrage n'ont pas été modifiés,
 l'installation de Mageia sera automatiquement sélectionnée et démarrée.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Prenez plaisir !</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Visitez www.mageia.org pour toute question ou si vous désirez contribuer à
-Mageia.</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/firewall.xml b/docs/docs/stable/installer/fr/firewall.xml
index 55704c09..f06eae6f 100644
--- a/docs/docs/stable/installer/fr/firewall.xml
+++ b/docs/docs/stable/installer/fr/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="fr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="fr" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Pare-feu</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Pare-feu</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">Cette section vous permet de configurer quelques règles simples de pare-feu
@@ -8,24 +14,24 @@
 acceptés par le système cible. Ceci autorise, en somme, les services
 correspondant d'être accessibles depuis Internet.</para>
 
-  <para>Dans la configuration par défaut, aucune case n'est cochée et aucun service
-n'est accessible de l'extérieur. Le bouton <emphasis>Tout (pas de
-pare-feu)</emphasis>autorise l'accès à tous les services de la machine - une
-option qui n'a beaucoup de sens dans le contexte de l'installateur puisque
-le système n'est plus protégé. Sa véritable utilisation dans le contexte du
-Centre de Contrôle de Mageia (qui utilise la même interface) pour désactiver
-de manière temporaire l'ensemble des règles du pare-feu à des fins de test
-et de débogage.</para>
+  <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
 
-  <para>Toutes les autres options se comprennent directement. Comme exemple, vous
-cocherez <emphasis role="bold">Serveur CUPS</emphasis> si vous souhaitez que
-les imprimantes de votre machine soient accessibles depuis le réseau.</para>
+  <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Avancé</emphasis></para>
 
-  <para> Le bouton <emphasis>Avancé</emphasis> ouvre une fenêtre où vous pouvez
-activer une série de services en saisissant une liste de couples, séparés
-par des espaces.</para>
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
 
diff --git a/docs/docs/stable/installer/fr/formatPartitions.xml b/docs/docs/stable/installer/fr/formatPartitions.xml
index 1b574563..453bd265 100644
--- a/docs/docs/stable/installer/fr/formatPartitions.xml
+++ b/docs/docs/stable/installer/fr/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="fr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formatage</title>
   </info>
@@ -11,36 +18,37 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Choisir ici quelle(s)  partition(s) est(sont) à formater. Toutes les données
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Choisir ici quelle(s)  partition(s) est(sont) à formater. Toutes les données
 présentes sur les partitions <emphasis>non</emphasis> cochées seront
 préservées.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Habituellement, au moins les partitions sélectionnées par DrakX doivent être
-formatées.</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Cliquer sur <guibutton>Avancé</guibutton> pour désigner les partitions où
-l'on souhaite que soient recherchés les <emphasis> blocs
-défectueux.</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">Si vous n'êtes pas encore sûr de votre choix, cliquer sur
-<guibutton>Précédent</guibutton>, à nouveau sur
-<guibutton>Précédent</guibutton> puis sur
-<guibutton>Personnaliser</guibutton> pour revenir à l'écran principal.  Dans
-cet écran, il est possible d'examiner le contenu des partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">Lorsque la sélection est faites avec certitude, cliquer sur
-<guibutton>Suivant</guibutton> pour continuer.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/fr/graphicalConfiguration.xml b/docs/docs/stable/installer/fr/graphicalConfiguration.xml
new file mode 100644
index 00000000..baee30c1
--- /dev/null
+++ b/docs/docs/stable/installer/fr/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/fr/installUpdates.xml b/docs/docs/stable/installer/fr/installUpdates.xml
index cbbb2729..b4d766a7 100644
--- a/docs/docs/stable/installer/fr/installUpdates.xml
+++ b/docs/docs/stable/installer/fr/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="fr">
-  <info>
-    <title xml:id="installUpdates-ti1">Mises à jour</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Mises à jour</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Depuis la publication de cette version de <application>Mageia</application>,
-un certain nombre de paquets ont été mis à jour ou améliorés.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choisissez <guilabel>oui</guilabel> si vous souhaitez les télécharger et les
-installer, sélectionnez <guilabel>non</guilabel> si vous ne le souhaitez
-pas, ou si vous n'êtes pas connecté à Internet</para>
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Cliquer sur <guibutton>Suivant</guibutton> pour continuer</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/installer.xml b/docs/docs/stable/installer/fr/installer.xml
index 3f0e6565..200649fd 100644
--- a/docs/docs/stable/installer/fr/installer.xml
+++ b/docs/docs/stable/installer/fr/installer.xml
@@ -6,172 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, l'installateur de Mageia</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, l'installateur de Mageia</title>
   </info>
 
   <para>Que vous soyez nouvel utilisateur de GNU-Linux ou expérimenté,
 l'installateur de Mageia est conçu pour vous rendre l'installation ou la
 mise à jour aussi aisée que possible.</para>
 
-  <para>L'écran du menu initial présente plusieurs options, cependant l'option par
-défaut démarre l'installation, ce qui correspondra à ce qui est souhaité la
-plupart du temps .</para>
+  <section>
+    <title>Les étapes de l'installation</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Ecran d'accueil de l'installation</title>
 
-    <section>
-      <title>Utilisation d'un DVD Mageia</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
+
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
 
-      <para>Voici les écrans d'accueil par défaut lors de l'utilisation du DVD Mageia,
-le premier pour un système UEFI, le second pour un système avec avec le mode
-Legacy :</para>
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>A partir de cet écran, vous pouvez accéder à des options en pressant la
-lettre <emphasis role="bold">e</emphasis> pour entrer dans le mode
-d'édition. Pour revenir à cet écran, presser soit la touche <emphasis
-role="bold">Echap</emphasis> pour quitter sans sauvegarder ou presser
-<emphasis role="bold">Ctrl</emphasis> ou <emphasis
-role="bold">F10</emphasis> pour quitter en sauvegardant. </para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>Depuis cet écran, il est possible paramétrer des préférences (notez que les
-options <emphasis role="bold">F1</emphasis> à <emphasis
-role="bold">F6</emphasis> ne sont disponibles que pour les systèmes Legacy)
-:<itemizedlist>
-          <listitem>
-            <para>Pour chacune des options <emphasis role="bold">F2</emphasis> à <emphasis
-role="bold">F6</emphasis>, une aide est disponible par la touche <emphasis
-role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>L'option <emphasis role="bold">F2</emphasis> permet de choisir une langue
-pour l'installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Utilisez les flèches haut et bas pour sélectionner la langue puis <emphasis
-role="bold">Entrée</emphasis></para>
-          </listitem>
-
-          <listitem>
-            <para>Modifiez la résolution de l'écran en pressant la touche <emphasis
-role="bold">F3</emphasis> (mode Legacy uniquement)</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Si vous rencontrez des problèmes pour l'installation, vous pouvez tenter de
-modifier les options d'amorçage par défaut avec la touche <emphasis
-role="bold">F6 Kernel Options</emphasis> ou la touche <emphasis
-role="bold">e</emphasis> pour les systèmes UEFI.</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Default. Cela ne modifie rien dans les options par défaut.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: la priorité est donnée à la sécurité au détriment des
-performances.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI : (Advanced Configuration and Power Interface), la gestion de
-l'alimentation n'est pas prise en compte.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC (Local Advanced Programmable Interrupt Controller)
-Interruptions de l'unité centrale. Sélectionnez cette option si vous
-rencontrez des problèmes tels qu'un "kernel panic" en lien avec l'APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>Si vous sélectionnez l'une de ces entrées, cela modifie les options par
-défaut affichées dans la ligne <guilabel>Options de démarrage</guilabel>.</para>
-
-            <note>
-              <para>Dans certaines versions de Mageia, il peut arriver que les entrées
-sélectionnées avec la touche <emphasis role="bold">F6</emphasis>
-n'apparaissent pas dans la ligne <guilabel>Options de démarrage</guilabel>,
-cependant elles sont bien prises en compte.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Presser la touche <emphasis role="bold">F1</emphasis> ouvre une fenêtre
-d'aide avec diverses options d'amorçage. Sélectionnez-en une avec les
-touches directionnelles, puis pressez <emphasis
-role="bold">Entrée</emphasis> pour obtenir plus de détails ou la touche
-d'échappement <emphasis>Esc</emphasis> pour revenir vers l'écran d'accueil.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>Vue détaillée de l'option Splash. Appuyez sur <emphasis
-role="bold">Esc</emphasis> ou sélectionnez <guilabel>Retour aux options de
-démarrage</guilabel> pour revenir à la liste des options. Ces options
-peuvent être ajoutées à la main à la ligne <guilabel>Options de
-démarrage</guilabel>.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>L'aide est traduite dans la langue sélectionnée en pressant la touche
-<emphasis role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>Pour plus d'information sur les options du noyau sur les systèmes en mode
-Legacy ou avec UEFI, consulter : <link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>Les étapes de l'installation</title>
+    <section>
+      <title>UEFI Systems</title>
+
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
+
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Le processus d'installation se divise en étapes successives qui peuvent être
-suivies dans le panneau latéral à gauche de l'écran.</para>
-
-    <para>Chaque étape contient un ou plusieurs écrans qui peuvent à leur tour
-présenter une section <guibutton>Avancé</guibutton> qui offre des options
-supplémentaires moins communes.</para>
-
-    <para>La plupart des écrans présentent un bouton d'<guibutton>Aide</guibutton> qui
-apporte davantage d'explications au sujet de l'étape particulière.</para>
-
-    <note>
-      <para>Si vous décidez d'arrêter l'installation à un moment donné de son
-déroulement, il est possible de redémarrer, mais bien y réfléchir
-avant. Lorsqu'une partition a été formatée ou lorsque des mises à jour ont
-commencé à être écrites, l'ordinateur n'est plus dans le même état et le
-redémarrage peut très bien rendre le système inutilisable. Si malgré tout,
-vous êtes sûrs de vouloir redémarrer, ouvrir une console en appuyant
-simultanément sur les trois touches <guibutton>alt ctrl
-F2</guibutton>. Ensuite appuyer simultanément sur les trois touches
-<guibutton>alt ctrl suppr</guibutton> pour redémarrer.</para>
-    </note>
+      <itemizedlist>
+        <title>Menu</title>
+
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -182,21 +174,20 @@ F2</guibutton>. Ensuite appuyer simultanément sur les trois touches
 
       <itemizedlist>
         <listitem>
-          <para>Après l'écran initial, vous n'obtenez pas l'écran de sélection de la
-langue. Cela peut arriver avec certaines cartes graphiques et vieux
-systèmes. Essayez d'utiliser une basse résolution en tapant
-<code>vgalo</code> à l'invite.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
-          <para>Si le matériel est très vieux, une installation graphique peut être
-impossible. Dans ce cas il est nécessaire de tenter une installation en mode
-texte. Pour cela, appuyer sur la touche <emphasis
-role="bold">Échap</emphasis> au moment du premier écran d'accueil et
-confirmer en appuyant sur <emphasis role="bold">Entrée</emphasis>. Un écran
-noir avec le mot "boot" va apparaître. Taper "text" et appuyer sur <emphasis
-role="bold">Entrée</emphasis>. Continuer ensuite avec l'installation en mode
-texte.</para>
+          <para>If the hardware is very old, a graphical installation may not be
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -204,32 +195,30 @@ texte.</para>
     <section>
       <title>L'installation se fige</title>
 
-      <para>Si le système semble se figer pendant l'installation, cela peut provenir
-d'un problème de détection du matériel. Dans ce cas, la détection
-automatique peut être escamotée et traitée ultérieurement.  Pour tenter
-cela, tapez <code>noauto</code> à l'invite. Cette option peut être combinée
-avec les précédentes si nécessaire..</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
       <title>Problème de mémoire vive</title>
 
-      <para>Cela sera rarement nécessaire, mais dans certains cas, le matériel peut
-détecter la mémoire vive (RAM) disponible de manière incorrecte. Pour la
-spécifier manuellement, utilisez le paramètre <code>mem=xxxM</code> où xxx
-est la quantité correcte de RAM. Par exemple  <code>mem=256M</code> pour
-spécifier 256Mo de RAM.</para>
+      <para>This will rarely be needed, but in some cases the hardware may report the
+available RAM incorrectly. To specify this manually, you can use the
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Partitions dynamiques</title>
 
-      <para>Si vous avez converti votre disque dur d'un format <emphasis
-role="bold">primaire</emphasis> vers un format <emphasis
-role="bold">dynamique</emphasis> dans Microsoft Windows, vous devez savoir
-qu'il est impossible d'installer Mageia sur ce disque. Pour revenir vers un
-format <emphasis role="bold">primaire</emphasis>, consultez la documentation
-Microsoft : <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/fr/locale.xml b/docs/docs/stable/installer/fr/locale.xml
new file mode 100644
index 00000000..9628d1d9
--- /dev/null
+++ b/docs/docs/stable/installer/fr/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/fr/login.xml b/docs/docs/stable/installer/fr/login.xml
index a3d8f89b..42c47323 100644
--- a/docs/docs/stable/installer/fr/login.xml
+++ b/docs/docs/stable/installer/fr/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="fr"><info><title xml:id="label-to-adapt-ti1">Ecran de connexion</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>Ecran de connexion KDM</para></caption></mediaobject><para>Au final, vous arrivez sur l'écran de connexion.</para><para>Entrer votre nom d'utilisateur ainsi que votre mot de passe utilisateur, et
-dans quelques secondes, vous vous trouverez face à un environnement de
-bureau GNOME ou KDE (suivant le média live que vous utilisez). Vous pouvez
-dès maintenant commencer à utiliser votre installation de Mageia.</para><para>Vous pouvez trouver une autre partie de notre documentation dans <link
-linkend="https://wiki.mageia.org/en/Documentation-fr">le wiki Mageia</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="fr">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/media_selection.xml b/docs/docs/stable/installer/fr/media_selection.xml
index 870e6ff4..5875b154 100644
--- a/docs/docs/stable/installer/fr/media_selection.xml
+++ b/docs/docs/stable/installer/fr/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="fr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Sélection des média (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Vous avez ici la liste des dépôts disponibles. Leur disponibilité dépend du
 média utilisé pour réaliser l'installation. Le choix des dépôts détermine
@@ -32,11 +41,11 @@ de la distribution.</para>
     </listitem>
 
     <listitem>
-      <para>Le dépôt <emphasis>Nonfree</emphasis> comprend les paquetages qui sont
-gratuits, Mageia peut donc les distribuer, mais ils contiennent du logiciel
-soumis à des droits (d'où le nom Nonfree, signifiant Non libre). Par
-exemple, dans ce dépôt se trouvent les pilotes propriétaires des cartes
-graphiques nVidia et ATI, les firmwares de diverses cartes Wifi, etc.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/fr/minimal-install.xml b/docs/docs/stable/installer/fr/minimal-install.xml
index 5e0893a7..4b71698f 100644
--- a/docs/docs/stable/installer/fr/minimal-install.xml
+++ b/docs/docs/stable/installer/fr/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="fr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="fr">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Installation minimale</title>
   </info>
@@ -10,35 +13,44 @@
 
   
 
-  <para>Il est possible de choisir une installation minimale en dé-sélectionnant
-tout dans l'écran Sélection du groupe de paquetages, voir <xref
-linkend="choosePackageGroups"/>.</para>
-
-  <para>Si vous le souhaitez, vous pouvez également cocher l'option <emphasis
-role="bold">Sélection individuelle des paquetages</emphasis> sur le même
-écran.</para>
-
-  <para>L'installation minimale est destinée à ceux qui utilisent
-<application>Mageia</application> pour des cas spécifiques, tels qu'un
-serveur ou une station de travail spécialisée. Vous utiliserez probablement
-cette option en combinaison avec la <emphasis role="bold">sélection
-individuelle des paquetages</emphasis> mentionnée ci-dessus, pour régler
-finement votre installation. Pour plus de détails, consultez <xref
-linkend="choosePackagesTree"></xref>.</para>
-
-  <para>Si vous choisissez cette méthode d'installation, l'écran correspondant vous
-proposera d'installer quelques outils utiles, tels que de la documentation
-et le serveur graphique X.</para>
-
-  <para>Si vous choisissez <emphasis role="bold">Avec serveur X</emphasis>, alors
-IceWM (un environnement de bureau très léger) sera également installé.</para>
-
-  <para>La documentation de base est fournie sous la forme de pages man ou de pages
-info. Elle contient les pages man du <link
-xlink:href="http://www.tldp.org/manpages/man.html">Projet de Documentation
-Linux</link> et les pages info des <link
-xlink:href="http://www.gnu.org/software/coreutils/manual/">utilitaires
-GNU</link>.</para>
+  
+
+  
+
+  
+
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
+xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
+Project</link> and the <link
+xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
+coreutils</link> info pages.</para>
 
   <mediaobject>
 <imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
diff --git a/docs/docs/stable/installer/fr/misc-params.xml b/docs/docs/stable/installer/fr/misc-params.xml
index 957334a6..0a15fe69 100644
--- a/docs/docs/stable/installer/fr/misc-params.xml
+++ b/docs/docs/stable/installer/fr/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Résumé des différents paramètres</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
-
-  <para xml:id="misc-params-pa1" revision="1">DrakX suggère des réglages judicieux pour la configuration du système en
-tenant compte des choix faits par vous-même et du matériel détecté. Il est
-possible ici de vérifier les paramètres et de les changer si souhaité en
-cliquant sur <guibutton>Configurer</guibutton>.</para>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+  <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>En règle générale, il est recommandé de conserver les paramètres par défaut,
@@ -26,8 +42,7 @@ sauf si :<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>une autre élément mentionné dans les sections détaillées ci-dessous pose
-problème.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -39,48 +54,48 @@ problème.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Fuseau horaire :</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX sélectionne un fuseau horaire en fonction de la langue choisie. Vous
-pouvez le modifier si nécessaire. Voir aussi <xref
-linkend="configureTimezoneUTC"/></para>
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Pays / Région :</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">Si le pays sélectionné est erroné, il est très important de rectifier ce
 paramètre. Voir <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Chargeur de démarrage : </guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX a fait les bons choix pour le paramétrage du chargeur de démarrage.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Ne changez rien à moins de savoir configurer GRUB2.</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Pour plus d'informations, voir <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Gestion de l'utilisateur :</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Il est possible d'ajouter des utilisateurs supplémentaires ici. Chacun se
-verra attribuer son propre répertoire <literal>/home</literal>.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Services :</guilabel></para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">Les services systèmes sont ces petits programmes exécutés en tâche de fond
 (démons). Cet outil permet d'autoriser ou interdire l'exécution de certaines
 processus.</para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Soyez sûrs de ce que vous faîtes avant de changer quoi que ce soit ici - une
-erreur peut empêcher le fonctionnement correct de l'ordinateur.</para>
-
-        <para>Pour plus d'informations, voir <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -92,7 +107,7 @@ erreur peut empêcher le fonctionnement correct de l'ordinateur.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Clavier </guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configurez la disposition de votre clavier en fonction de votre
 localisation, de votre langue et de votre type de clavier.</para>
@@ -104,29 +119,32 @@ perdez pas de vue que vos mots de passe changeront aussi.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Souris :</guilabel></para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Configurer ou ajouter ici d'autres périphériques de pointage, tablettes,
 trackballs etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Carte son :</guilabel></para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">L'installeur sélectionne le pilote par défaut, s'il en existe un. La
-possibilité de sélectionner un pilote différent n'est donnée que s'il existe
-plus d'un pilote pour votre carte, mais qu'aucun d'entre eux n'est celui par
-défaut.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Interface graphique : </guilabel></para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Cette partie permet la configuration de la(des) carte(s) graphique(s) et de
-l'affichage.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Pour plus d'informations voir <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -141,13 +159,12 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Réseau :</guilabel></para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
-        <para xml:id="misc-params-network-pa2" revision="1">Il est possible de configurer le réseau ici, mais pour les cartes réseau
-exigeant un pilote non libre, il est préférable de le faire après le
-redémarrage, dans le <application>Centre de Contrôle de
-Mageia</application>, si vous n'avez pas encore validé les dépôts de média
-non libres (nonfree).</para>
+        <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
+repositories.</para>
 
         <warning>
           <para xml:id="misc-params-network-pa3" revision="1">Lorsque vous ajoutez une carte réseau, n'oubliez pas de configurer votre
@@ -156,14 +173,14 @@ pare-feu pour qu'il surveille aussi cette interface.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxies</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">Un serveur Proxy (aussi appelé serveur mandataire) se comporte en
-intermédiaire entre votre ordinateur et internet. Cette partie permet de
-configurer votre ordinateur pour qu'il utilise un service proxy.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">Peut-être sera t-il utile de consulter l'administrateur système pour obtenir
-les valeurs des paramètres à entrer ici.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -175,27 +192,31 @@ les valeurs des paramètres à entrer ici.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Niveau de sécurité</guilabel> :</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Régler ici le niveau de sécurité choisi pour l'ordinateur, le plus souvent
-les valeurs par défaut (Standard) conviennent pour un usage général.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Cocher l'option qui convient le mieux à votre utilisation de l'ordinateur.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Pare-feu</guilabel> :</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">Un pare-feu tente de se dresser en barrière entre les données importantes
-sur l'ordinateur et les voyous qui tournent autour, depuis internet, et qui
-cherchent à les compromettre ou à les voler.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Selectionnez les services que vous souhaitez voir accéder à votre
-système. Votre choix dépend de l'utilisation envisagée de l'ordinateur. Pour
-plus d'informations, voir <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Garder à l'esprit que tout autoriser (pas de pare-feu) est très risqué.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/fr/reboot.xml b/docs/docs/stable/installer/fr/reboot.xml
index c707fb68..1ecf628c 100644
--- a/docs/docs/stable/installer/fr/reboot.xml
+++ b/docs/docs/stable/installer/fr/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="fr" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Redémarrage</title>
   </info>
   
-  <para>Une fois le chargeur de boot installé, vous serez invité à arrêter votre
-ordinateur, enlever le Live CD et redémarrer l'ordinateur, cliquez sur
-<emphasis role="bold"><guibutton>Terminé</guibutton></emphasis> et faites ce
-qui est demandé<emphasis role="bold"> dans cet ordre !</emphasis></para>
+  
+  <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>Après le redémarrage, vous verrez une succession de barres de progression du
-téléchargement. Elles indiquent que les listes des media logiciels sont en
-cours de téléchargement (voir Gestion des logiciels).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/fr/securityLevel.xml b/docs/docs/stable/installer/fr/securityLevel.xml
index 16dabecb..d61c123a 100644
--- a/docs/docs/stable/installer/fr/securityLevel.xml
+++ b/docs/docs/stable/installer/fr/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Niveau de Sécurité</title>
   </info>
@@ -7,31 +14,33 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Veuillez choisir le niveau de sécurité
 souhaité</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1">Le paramètre par défaut est <emphasis role="bold">Standard</emphasis>, et il
-est recommandé pour l'utilisateur moyen. <emphasis
-role="bold">Sécurisé</emphasis> mettra en place un système hautement
-protégé, ce paramètre conviendra si le système doit être utilisé comme
-serveur public, par exemple.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para>Administrateur de sécurité</para>
 
-  <para xml:id="securityLevel-pa2" revision="1">Cette rubrique vous permet d'indiquer une adresse e-mail à laquelle le
+  <para revision="1" xml:id="securityLevel-pa2">Cette rubrique vous permet d'indiquer une adresse e-mail à laquelle le
 système enverra des <emphasis>message d'alerte de sécurité</emphasis>
 lorsqu'il détecte des situations qui nécessitent d'être notifiées à un
 administrateur système.</para>
 
-  <para>Un choix valide et facile à mettre en œuvre consiste à entrer
-&lt;user>@localhost -- où &lt;user> est l'identifiant de l'utilisateur qui
-sera le destinataire de ces messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>Le système envoie des messages de type <emphasis role="bold">Unix
@@ -40,7 +49,6 @@ utilisateur doit donc être correctement configuré pour recevoir les messages
 de ce type.</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">Après l'installation, il sera toujours possible de régler les paramètres de
-sécurité dans le volet <guilabel>Sécurité </guilabel>dans le Centre de
-Contrôle de Mageia.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/fr/selectCountry.xml b/docs/docs/stable/installer/fr/selectCountry.xml
index f06a23a9..cc7a29b7 100644
--- a/docs/docs/stable/installer/fr/selectCountry.xml
+++ b/docs/docs/stable/installer/fr/selectCountry.xml
@@ -1,28 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="fr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="fr">
   <info>
     <title xml:id="selectCountry-ti1">Sélection du Pays / Région</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Sélectionnez votre pays ou région. Cela impacte toutes sortes de
-paramétrages importants, comme la monnaie et le domaine réglementaire du
-wi-fi.  Choisir un pays erroné peut conduire à ne pas pouvoir utiliser un
-réseau sans fil.</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+like the currency and wireless regulatory domain. Setting the wrong country
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">Si votre pays n'est pas dans la liste, cliquez sur <guilabel>Autres
-pays</guilabel> et choisissez-y votre pays/région.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">Si votre pays se trouve uniquement dans la liste <guilabel>Autres
-pays</guilabel>, après avoir cliqué sur <guibutton>OK</guibutton> il peut
-sembler qu'un pays de la première liste ait été choisi. N'y prêtez pas
-attention, DrakX respectera votre choix. </para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -30,21 +40,19 @@ attention, DrakX respectera votre choix. </para>
       <title xml:id="inputMethod-ti7">Méthode de saisie</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">Sur l'écran <guilabel>Autres pays</guilabel>, vous pouvez aussi sélectionner
-une méthode de saisie des caractères (à la fin de la liste). Les méthodes de
-saisie permettent d'utiliser des caractères plurilingues (chinois, japonais,
-corréens, etc.). IBus est la méthode de saisie par défaut, il ne devrait
-donc pas être nécessaire de la configurer manuellement. D'autres méthodes de
-saisie (SCIM, GCNI, HIME, etc.) proposent des fonctions similaires et
-peuvent être installées si vous avez ajouté les médias HTTP/FTP avant la
-sélection du paquetage.</para>
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
+input method (at the bottom of the list). Input methods allow users to input
+multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
+default input method, so users should not need to configure it
+manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
+functions and can be installed if you added HTTP/FTP media before package
+selection.</para>
 
     <note>
-      <para xml:id="selectCountry-pa5" revision="1">Si vous avez manqué la configuration de la méthode de saisie pendant
-l'installation, vous pourrez y accéder après le redémarrage de votre
-système, via le <emphasis role="bold">Centre de Contôle Mageia</emphasis> ->
-<emphasis role="bold">Système</emphasis>, ou en exécutant "localedrake" en
-tant que super-utilisateur.</para>
+      <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/selectInstallClass.xml b/docs/docs/stable/installer/fr/selectInstallClass.xml
index 5cd0fb35..a6bb56d2 100644
--- a/docs/docs/stable/installer/fr/selectInstallClass.xml
+++ b/docs/docs/stable/installer/fr/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="fr" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,55 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Installation ou Mise à jour</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Installation</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Utilisez cette option pour réaliser une installation à neuf de
-<application>Mageia</application>. Elle formatera la partition root (/) tout
-en conservant intacte la partition /home séparée.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Mise à jour</para>
-
-      <para>Ceci peut être utilisé pour faire une mise à jour d'une version de
-<application>Mageia</application> préalablement installée.</para>
-
-      <warning>
-        <para>Seule la mise à jour d'une version précédente de Mageia, et
-<emphasis>toujours supportée</emphasis> à la sortie de cet installateur, a
-été testée en profondeur. Si vous souhaitez mettre à jour une Mageia qui
-n'est plus supportée, alors il est préférable de faire une installation
-propre en conservant votre partition <literal>/home</literal>.</para>
-      </warning>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
+
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>Si vous décidez d'interrompre l'installation en cours de route, il est
-possible de redémarrer, mais réfléchissez bien avant de le faire. Une fois
-que la partition aura été formatée, ou que les mises à jour ont commencé à
-être installées, votre ordinateur n'est plus dans le même état, et le
-redémarrer peut très bien rendre le système inutilisable. Si malgré tout,
-vous êtes sûr de vouloir redémarrer, ouvrez une console en appuyant
-simultanément sur <guilabel>Alt+Ctrl+F2</guilabel>. Ensuite, appuyez sur
-<guilabel>Alt+Ctrl+Suppr</guilabel> simultanément pour redémarrer.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
-    <para>Si vous vous rendez compte que vous avez oublié de sélectionner une langue
-supplémentaire, il est possible de revenir de l'écran <emphasis
-role="bold">Installation ou mise à jour</emphasis> vers l'écran de choix des
-langues en appuyant simultanément sur
-<guilabel>Alt+Ctrl+Début</guilabel>. <emphasis role="bold">Ne faites pas
-cela</emphasis> plus loin dans l'installation.</para>
+    <para>If you have discovered that you forgot to select an additional language, you
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/fr/selectKeyboard.xml b/docs/docs/stable/installer/fr/selectKeyboard.xml
index a6acd442..0be596e4 100644
--- a/docs/docs/stable/installer/fr/selectKeyboard.xml
+++ b/docs/docs/stable/installer/fr/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="fr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,20 +19,23 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Clavier</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX sélectionne une disposition de clavier adaptée à votre langue. Si
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX sélectionne une disposition de clavier adaptée à votre langue. Si
 aucune disposition convenable n'est trouvée, il choisira par défaut le
 clavier US.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">S'assurer que la sélection est correcte ou bien choisir une autre
+      <para revision="1" xml:id="selectKeyboard-pa2">S'assurer que la sélection est correcte ou bien choisir une autre
 disposition de clavier.  Si cette disposition du clavier est inconnue, se
 référer aux spécifications livrées avec le système ou bien demander au
 vendeur de l'ordinateur. Il y a peut-être même une étiquette sur le clavier
@@ -28,23 +44,22 @@ xlink:href="http://fr.wikipedia.org/wiki/Disposition_des_touches_des_claviers_in
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">Si votre clavier n'apparaît pas dans la liste, cliquez sur
-<guibutton>Davantage</guibutton> pour obtenir une liste complète et y
-choisir votre clavier.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">Après avoir choisi un clavier dans la liste obtenue en cliquant sur
-<guibutton>Davantage</guibutton>, vous reviendrez à la première liste, et il
-vous semblera que c'est un clavier de cette liste qui a été sélectionné. N'y
-prêtez pas attention et continuez l'installation : le clavier choisi depuis
-la liste complète sera bien pris en compte.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">Si vous choisissez un clavier de caractères non-latins, un écran
+      <para revision="1" xml:id="selectKeyboard-pa4">Si vous choisissez un clavier de caractères non-latins, un écran
 supplémentaire vous demandera comment vous souhaitez passer de la
 disposition latine à la disposition non-latine.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/fr/selectKeyboardLive.xml b/docs/docs/stable/installer/fr/selectKeyboardLive.xml
index 4918095e..02dfc7a7 100644
--- a/docs/docs/stable/installer/fr/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/fr/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Sélectionner le clavier</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>On vous demandera de régler le clavier que vous désirez utiliser dans
-Mageia. Celui par défaut est sélectionné en fonction de votre langue et de
-votre fuseau hoaraire précédemment choisis.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/fr/selectLanguage.xml b/docs/docs/stable/installer/fr/selectLanguage.xml
index a891a9ab..a00017d7 100644
--- a/docs/docs/stable/installer/fr/selectLanguage.xml
+++ b/docs/docs/stable/installer/fr/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,52 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Veuillez choisir la langue à utiliser</title>
   </info>
 
-  <para condition="classical">Sélectionner la langue désirée en déployant d'abord le continent
-concerné. <application>Mageia</application> utilisera cette sélection
-pendant l'installation et pour le système une fois installé.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Sélectionner la langue désirée. <application>Mageia</application> utilisera
-cette sélection pendant l'installation et pour le système une fois installé.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">S'il est probable que vous (ou d'autres utilisateurs) ayiez besoin que
-plusieurs langues soient installées sur votre système, alors utilisez
-l'option <guibutton>Langues multiples</guibutton>pour les ajouter dès
-maintenant. Il sera difficile d'ajouter la prise en charge de langues
-supplémentaires après l'installation.</para>
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
-    <para>Même si vous souhaitez installer plusieurs langues, vous devez au préalable
-en désigner une comme langue préférée sur le premier écran des langues. Elle
-sera marquée comme choisie sur l'écran des langues multiples.</para>
-  </warning>
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
-      <para>Si la langue du clavier ne correspond pas à la langue préférée, alors il est
-conseillé d'installer également la langue du clavier correspondante.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia utilise par défaut le codage UTF-8 (Unicode)</para>
-
-      <para condition="classical">Ceci peut être désactivé sur l'écran <emphasis role="bold">Langues
-multiples</emphasis> si vous savez que c'est contre-indiqué pour votre
-langue. Désactiver UTF-8 s'applique à toutes les langues installées.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>Vous pouvez modifier la langue de votre système après l'installation dans le
-Centre de Contrôle Mageia > Système > Gérer les paramètres locaux de votre
-système.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/fr/selectMouse.xml b/docs/docs/stable/installer/fr/selectMouse.xml
index faeb8921..8f943bb0 100644
--- a/docs/docs/stable/installer/fr/selectMouse.xml
+++ b/docs/docs/stable/installer/fr/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="fr">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Sélection de la souris</title>
   </info>
@@ -7,27 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-selectMouse.png"
-align="center" format="PNG" xml:id="selectMouse-im1"></imagedata>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Si le comportement de la souris n'est pas satisfaisant, en choisir une autre
 ici.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Le plus souvent, <guilabel>Universelle</guilabel> - <guilabel>N'importe
-quelle souris PS/2 ou USB </guilabel> est un bon choix.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Sélectionner <guilabel>Universelle</guilabel> - <guilabel>Force
-evdev</guilabel> pour configurer les boutons qui ne fonctionnent pas sur une
-souris à six boutons ou plus.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/fr/setupBootloader.xml b/docs/docs/stable/installer/fr/setupBootloader.xml
index 355ed97d..d0827a52 100644
--- a/docs/docs/stable/installer/fr/setupBootloader.xml
+++ b/docs/docs/stable/installer/fr/setupBootloader.xml
@@ -1,158 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="fr" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="fr" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Principales options du chargeur de démarrage</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Interface du programme d'amorçage</title>
-    <para>Par défaut, Mageia utilise exclusivement :</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (avec ou sans menu graphique) pour un système MBR/Legacy ou GPT/Legacy</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi pour un système UEFI.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>Les menus graphiques de Mageia sont superbes :) </para>
-    </tip>
-    <section>
-      <title>GRUB2 sur des systèmes MBR/Legacy et GPT/Legacy </title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Ne modifiez le <emphasis role="bold">Périphérique de démarrage</emphasis>
-que si vous savez vraiment ce que vous faites.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi sur les systèmes UEFI</title>
-      <para>Sur un système UEFI, l'interface utilisateur est légèrement différente, car
-vous ne pouvez pas choisir entre les options <emphasis
-role="bold">avec</emphasis> ou <emphasis role="bold">sans</emphasis> menu
-graphique.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>Si Mageia est le seul système installé sur votre ordinateur, l'installeur
-crée une partition ESP (EFI System Partition) pour recueillir le chargeur de
-démarrage (GRUB2-efi). S'il y a déjà des systèmes d'exploitation UEFI
-installés sur votre ordinateur (Windows 8 par exemple), l'installeur Mageia
-détecte l'ESP existante créée par Windows et ajoute GRUB2-efi. Bien qu'il
-soit possible d'avoir plusieurs ESP, une seule est suffisante (et
-conseillée), quel que soit le nombre de systèmes d'exploitation installés.</para>
-      <para>Ne modifiez le <emphasis role="bold">Périphérique de démarrage</emphasis>
-que si vous savez vraiment ce que vous faites.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Utiliser un chargeur de démarrage Mageia</title>
-    <para>Par défaut, et en fonction de votre système, Mageia écrit soit :</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>un chargeur de démarrage GRUB2, soit dans le MBR (Master Boot Record) de
-votre premier disque dur, soit dans la partition  de démarrage BIOS.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>un chargeur de démarrage GRUB2-efi dans la partition ESP.</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>Si vous avez déjà d'autres systèmes d'exploitation installés, Mageia tente
-de les ajouter à votre nouveau menu de démarrage. Si vous ne le voulez pas,
-cliquez sur <guibutton>Suivant</guibutton>, puis décochez l'option <emphasis
-role="bold">Détecter les autres OS</emphasis>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Utiliser un chargeur de démarrage existant.  </title>
-    <para>La procédure correcte pour ajouter votre système Mageia dans un chargeur de
-démarrage existant dépasse le cadre de cette documentation, néanmoins, dans
-la plupart des cas, cela impliquera d'exécuter le programme d'installation
-du chargeur de démarrage concerné, qui devrait le détecter et l'ajouter
-automatiquement. Voir la documentation du système d'exploitation en
-question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Utilisation du chargement en chaîne</title>
-    <para>Si vous ne souhaitez pas avoir une Mageia bootable, mais la chaîner depuis
-un autre SE, cliquez sur <guibutton>Suivant</guibutton>, puis sur
-<guibutton>Avancé</guibutton> et cochez la case <guilabel>Ne pas toucher à
-l'ESP ou au MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>Vous allez avoir un avertissement disant que le chargeur de boot est
-manquant, ignorez le en cliquant sur <guibutton>OK</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
   </section>
   <section>
-    <title>Options</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>Première page</title>
-      <para><itemizedlist><listitem><para><guilabel>Délai avant l'activation du choix par défaut</guilabel> : cela
-vous permet de définir le délai, en secondes, avant le démarrage du système
-d'exploitation par défaut.</para></listitem><listitem><para><guilabel>Sécurité</guilabel> : Il est possible ici d'établir un mot de
-passe pour le chargeur de démarrage. Dans ce cas, un nom d'utilisateur et un
-mot de passe seront demandés au démarrage pour sélectionner une entrée ou
-modifier sa configuration. Le nom d’utilisateur est <emphasis
-role="bold">root</emphasis> et le mot de passe est celui défini ci-après.</para></listitem><listitem><para><guilabel>Mot de passe</guilabel> : Indiquez un mot de passe pour le
-chargeur de démarrage.</para></listitem><listitem><para><guilabel>Mot de passe (vérification)</guilabel> : Entrez à nouveau le mot
-de passe et Drakx vérifiera qu'il est identique au précédent.</para></listitem><listitem><para><guilabel>Avancé</guilabel></para><itemizedlist><listitem><para><guilabel>Activer l'ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) est un standard de gestion de l'énergie. Il permet d'économiser
-de l'énergie en arrêtant des périphériques inutilisés. Décocher cette case
-peut être utile si, par exemple, votre matériel n'est pas compatible ACPI ou
-si vous pensez que l'ACPI peut être source de problèmes (comme des
-redémarrages aléatoires ou des blocages).</para></listitem><listitem><para><guilabel>Activer le SMP</guilabel> : Cette option active/désactive le
-multi-processing symétique pour les processeurs multi-cœurs.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel> : Donne au système d'exploitation l'accès
-au Contrôleur Programmable Avancé des interruptions (Advanced Programmable
-Interrupt Controller).  Les périphériques APIC autorisent des modèles
-prioritaires plus complexes et la gestion des IRQ (Interrupt Request,
-Requête d'interruption) avancés.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel> : L'APIC local gère toutes les
-interruptions externes pour un processeur spécifique d'un système SMP.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Principales options du chargeur de démarrage</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Page suivante</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Choix par défaut</guilabel> Système d'exploitation démarré par
-défaut. </para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Options passées au noyau</guilabel> Cette option permet de passer
-des informations au noyau ou de lui demander plus d'informations lors du
-démarrage. </para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Détecter les autres OS</guilabel> : Voir ci-dessus  <link
-linkend="setupMageiaBootloader">Utiliser un chargeur de démarrage
-Mageia</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Avancé</guilabel><itemizedlist><listitem><para><guilabel>Mode vidéo</guilabel> Définir ici la taille de l'écran et la
-profondeur de couleurs qui seront utilisés par le menu de démarrage. Si vous
-cliquez sur le triangle, des options supplémentaires de taille d'écran et de
-profondeur de couleurs vous seront proposées.</para></listitem><listitem><para><emphasis role="bold">Ne pas toucher à l'ESP ni au MBR</emphasis> :  Voir
-ci-dessus <link linkend="setupChainLoading">Utilisation du chargement en
-chaîne</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Utiliser un chargeur de démarrage existant.  </title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Ajouter ou Modifier une Entrée de Menu de Démarrage</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/setupSCSI.xml b/docs/docs/stable/installer/fr/setupSCSI.xml
index a63a06f7..5891415e 100644
--- a/docs/docs/stable/installer/fr/setupSCSI.xml
+++ b/docs/docs/stable/installer/fr/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="fr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Configuration du SCSI</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">Normalement, DrakX détectera les disques durs correctement. Néanmoins, avec
 certains contrôleurs SCSI anciens, il peut se révéler incapable de
 déterminer les bons pilotes et ne pas réussir à reconnaître le disque.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">Si cela se produit, vous devrez indiquer manuellement à DrakX quels disques
-SCSI sont présents.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">DrakX pourra alors les configurer correctement.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/fr/software.xml b/docs/docs/stable/installer/fr/software.xml
new file mode 100644
index 00000000..8d0ba9ee
--- /dev/null
+++ b/docs/docs/stable/installer/fr/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="fr" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/fr/soundConfig.xml b/docs/docs/stable/installer/fr/soundConfig.xml
index 893b600a..31f64e03 100644
--- a/docs/docs/stable/installer/fr/soundConfig.xml
+++ b/docs/docs/stable/installer/fr/soundConfig.xml
@@ -1,42 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="fr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Configuration du son</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Cet écran affiche le nom du pilote que l'installeur a choisi pour votre
-carte son. Ce sera le pilote par défaut, s'il existe.</para>
+  
 
-  <para>Le pilote par défaut devrait fontionner sans problème. Cependant, si après
-l'installation vous rencontrez des soucis, lancez la commande
-<command>draksound</command> ou bien démarrez cet outil via le CCM (Centre
-de Contrôle de Mageia), en sélectionnant l'onglet
-<guilabel>Matériel</guilabel> puis en cliquant sur <guilabel>Configuration
-du son</guilabel> en haut à droite de l'écran.</para>
+  
 
-  <para>Ensuite, dans l'écran de <emphasis role="bold">draksound</emphasis>, ou de
-<emphasis role="bold">Configuration du son</emphasis>, cliquez sur
-<guibutton>Dépannage</guibutton> pour obtenir des conseils utiles qui vous
-aideront à résoudre le problème.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Avancé</title>
     </info>
 
-    <para>Cliquer sur <emphasis role="bold"><guibutton>Avancé</guibutton></emphasis>
-sur cet écran, lors de l'installation, peut être utile s'il n'y a aucun
-pilote par défaut, que plusieurs pilotes sont disponibles mais que selon
-vous l'installeur a choisi le mauvais.</para>
-
-    <para>Dans ce cas vous pouvez sélectionner un pilote différent après avoir cliqué
-sur <emphasis role="bold"><guibutton>Choix d'un
-pilote</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/fr/takeOverHdConfirm.xml b/docs/docs/stable/installer/fr/takeOverHdConfirm.xml
index 1a71745a..d0236935 100644
--- a/docs/docs/stable/installer/fr/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/fr/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="fr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Confirmer le disque dur à formater</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
-
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Cliquez sur <guibutton>Précédent</guibutton> en cas de doute sur votre
-choix.</para>
-
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Cliquez sur <guibutton>Suivant</guibutton> pour continuer si vous êtes sûr
-de vouloir effacer toutes les partitions, tout système d'exploitation et
-toutes les données présents sur ce disque dur.</para>
-</section>
\ No newline at end of file
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
+choice.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/fr/testing.xml b/docs/docs/stable/installer/fr/testing.xml
index d94c787f..a16807e0 100644
--- a/docs/docs/stable/installer/fr/testing.xml
+++ b/docs/docs/stable/installer/fr/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Tester Mageia comme système "Live"</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Tester Mageia comme système "Live"</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,21 +17,20 @@
       <title xml:id="testing1-ti1">Mode LIVE</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>Vous obtenez cet écran si vous sélectionnez "Démarrer Mageia". Sinon, vous
-obtenez l'étape de "<link linkend="doPartitionDisks">Partitionnement</link>"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Contrôle du matériel</title>
       </info>
 
-      <para>L'un des objectifs du mode Live est de tester le matériel afin de savoir si
-Mageia le gère correctement. Vous pouvez vérifier si tous les périphériques
-ont un pilote dans la section Matériel du centre de contrôle de Mageia. Vous
-pouvez tester la plupart des périphériques actuels :</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -36,11 +38,7 @@ pouvez tester la plupart des périphériques actuels :</para>
         </listitem>
 
         <listitem>
-          <para>carte grahique : si vous voyez l'écran précédent, c'est déjà correct.</para>
-        </listitem>
-
-        <listitem>
-          <para>webcam :</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -48,7 +46,7 @@ pouvez tester la plupart des périphériques actuels :</para>
         </listitem>
 
         <listitem>
-          <para>imprimante : la configuer et imprimer une page de test</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -56,10 +54,13 @@ pouvez tester la plupart des périphériques actuels :</para>
         </listitem>
       </itemizedlist>
 
-      <para>Si tout vous semble correct, vous pouvez lancer l'installation. Sinon, vous
-pouvez sortir du programme avec le bouton Quitter.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>La configuration que vous avez réalisée est conservée pour l'installation.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -67,14 +68,14 @@ pouvez sortir du programme avec le bouton Quitter.</para>
         <title xml:id="testing3-ti1">Lancer l'installation</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>Pour lancer l'installation de Mageia LiveCD ou LiveDVD sur le disque dur
-(mécanique ou SSD), cliquez simplement sur l'icône "Installer sur le disque
-dur". Vous obtiendrez cet écran, et ensuite l'étape "<link
-linkend="doPartitionDisks">Partitioning</link>" pour l'installation directe.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/fr/uninstall-Mageia.xml b/docs/docs/stable/installer/fr/uninstall-Mageia.xml
index c5b92d70..056704b4 100644
--- a/docs/docs/stable/installer/fr/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/fr/uninstall-Mageia.xml
@@ -1,34 +1,44 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="fr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="fr" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Désinstaller Mageia</title>
   </info>
 
   
 
+  
+
   <para>Si Mageia ne vous a pas convaincu, ou que vous ne parvenez pas à l'installer
 correctement, en bref, si vous voulez vous en débarrasser, c'est votre droit
 et Mageia vous offre aussi la possibilité de tout désinstaller. Ce n'est pas
 le cas de tous les systèmes d'exploitation.</para>
 
-  <para>Après avoir sauvegardé vos données, redémarrez sur votre DVD d'installation
-de Mageia et sélectionnez <emphasis role="bold">Système de
-secours</emphasis>, puis <emphasis role="bold">Restaurer le chargeur
-d'amorçage Windows</emphasis>. A prochain démarrage, nous n'aurez plus que
-Windows, sans menu pour choisir un autre système d'exploitation. </para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>Pour récupérer l'espace utilisé par les partitions Mageia avec Windows,
-cliquez sur <code>Démarrer -> Panneau de configuration -> Outils
-administratifs -> Gestion de l'ordinateur -> Stockage -> Gestion des
-disques</code>. Vous reconnaîtrez les partitions Mageia par leur appellation
-<guilabel>Inconnu</guilabel>, mais également par leurs taille et position
-sur le disque. Faites un clic-droit sur chacune des ces partitions et
-sélectionnez <guibutton>Supprimer</guibutton>pour libérer l'espace disque.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-  <para>Si vous utilisez Windows XP, vous pouvez créer une nouvelle partition et la
-formater (en FAT32 ou en NTFS). Vous obtiendrez alors une lettre de
-partition.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>Si vous disposez de Windows Vista ou Windows 7, vous avez une possibilité
 supplémentaire, vous pouvez étendre la partition existante à gauche de
@@ -37,4 +47,4 @@ tels que <emphasis role="bold">gparted</emphasis>, disponible pour Windows
 et Linux. Comme toujours, lorsque vous modifiez des partitions, soyez très
 prudent et assurez-vous que toutes vos données importantes ont été
 sauvegardées.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/fr/unused.xml b/docs/docs/stable/installer/fr/unused.xml
index e34df99e..10b9ef21 100644
--- a/docs/docs/stable/installer/fr/unused.xml
+++ b/docs/docs/stable/installer/fr/unused.xml
@@ -1,28 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="fr" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="fr">
   <info>
     <title xml:id="unused-ti1">Conserver ou supprimer le matériel inutilisé</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
 
-  <para>Pendant cette étape, l'installateur recherche les paquetages inutilisés
-(matériel, langues). Il vous propose ensuite de les supprimer. Il est
-judicieux d'accepter, excepté si vous préparez une installation s'exécutant
-sur des configurations matériel différentes.</para>
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>La prochaine étape consistera à copier les fichiers sur le disque dur. Ceci
-peut prendre quelques minutes. A la fin, vous verrez s'afficher un écran
-vide pendant un certain temps, c'est normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/hi/DrakLive-cover.xml b/docs/docs/stable/installer/hi/DrakLive-cover.xml
index fb771577..715d5d52 100644
--- a/docs/docs/stable/installer/hi/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/hi/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="hi" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="hi" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Installation from LIVE medium</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>January 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Installation from LIVE medium</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">The Official Documentation for Mageia</para>
+      <para role="tagline">The Official Documentation for Mageia</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
+<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://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="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> 
+Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
+
   <article>
     <title>Installation from LIVE medium</title>
-       <para><note>
-          <para>No one will see all the installer screens that you see in this manual. Which
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
 screens you will see, depends on your hardware and the choices you make
 while installing.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/hi/DrakLive.xml b/docs/docs/stable/installer/hi/DrakLive.xml
index fbd36c8e..4aa3f7e9 100644
--- a/docs/docs/stable/installer/hi/DrakLive.xml
+++ b/docs/docs/stable/installer/hi/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="hi" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="hi" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Installation from LIVE medium</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Installation from LIVE medium</title>
 
     <cover>
       <para><note>
@@ -17,7 +32,7 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 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
+      <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>
@@ -39,7 +54,12 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +69,18 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/hi/DrakX-cover.xml b/docs/docs/stable/installer/hi/DrakX-cover.xml
index 8346d28b..ba51f97b 100644
--- a/docs/docs/stable/installer/hi/DrakX-cover.xml
+++ b/docs/docs/stable/installer/hi/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="hi" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="hi" xml:id="Quick-Startup"
+      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 DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>February 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>February 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">The Official Documentation for Mageia</para>
+      <para role="tagline">The Official Documentation for Mageia</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
+
+      <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://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="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> 
+Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Installation with DrakX</title>
-       <para><note>
-          <para>No one will see all the installer screens that you see in this manual. Which
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
 screens you will see, depends on your hardware and the choices you make
 while installing.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ while installing.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/hi/DrakX-inline.xml b/docs/docs/stable/installer/hi/DrakX-inline.xml
new file mode 100644
index 00000000..cb9d076c
--- /dev/null
+++ b/docs/docs/stable/installer/hi/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="hi" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Installation with DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the 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>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>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/DrakX.xml b/docs/docs/stable/installer/hi/DrakX.xml
index cf791d0b..f62b8eac 100644
--- a/docs/docs/stable/installer/hi/DrakX.xml
+++ b/docs/docs/stable/installer/hi/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="hi" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="hi" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Installation with DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Installation with DrakX</title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ Team</link>, if you would like to help improve this manual.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ Team</link>, if you would like to help improve this manual.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ Team</link>, if you would like to help improve this manual.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ Team</link>, if you would like to help improve this manual.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/hi/SelectAndUseISOs2.xml b/docs/docs/stable/installer/hi/SelectAndUseISOs2.xml
index fe75de72..e4cac8ed 100644
--- a/docs/docs/stable/installer/hi/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/hi/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="hi" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
   </info>
   <section>
     <title>भूमिका</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
-    <para>There are two families of media:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: Booting with this media provides you with the maximum
-flexibility when choosing what to install, and for configuring your
-system. In particular, you have a choice of which Desktop environment to
-install</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: This option allows you to try out Mageia without having to
-actually install it, or make any changes to your computer.  If the
-installation is decided, the process is simpler, but you get fewer choices
-than offered by the Classical installer</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Details are given in the next sections.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Media</title>
     <section>
       <title>Definition</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support (DVD, USB
-stick, ...) the ISO file is copied to.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
@@ -43,24 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the Classical installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
             <para>They are used for performing clean installs or to upgrade a previously
-installed version of Mageia.</para>
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Some tools are available in the Welcome screen: Rescue System, Memory Test,
-Hardware Detection Tool.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Each DVD contains many available desktop environments and languages.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>You'll be given the choice during the installation to add non free software.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -72,21 +107,19 @@ Hardware Detection Tool.</para>
         <itemizedlist>
           <listitem>
             <para>Can be used to preview the Mageia operating system without having to install
-it. Can also be used to install Mageia if you wish.</para>
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade previously installed Mageia
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>They contain non free software.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -94,13 +127,13 @@ releases.</emphasis></para>
         <title>Live DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Plasma desktop environment only.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -108,13 +141,13 @@ releases.</emphasis></para>
         <title>Live DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>GNOME desktop environment only.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -122,13 +155,13 @@ releases.</emphasis></para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Xfce desktop environment only.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 or 64 bit architectures.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -139,22 +172,10 @@ releases.</emphasis></para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>These are minimal ISO's containing no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient if
-bandwidth is too low to download a full DVD, or if you have a PC without a
-DVD drive or is unable to boot from a USB stick.</para>
-          </listitem>
-          <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>First steps are English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -162,8 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -171,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains non-free software (mostly drivers, codecs...) for people who need
-it.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -184,16 +204,23 @@ it.</para>
       <title>Downloading</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, you are provided with some information, such as
-the mirror in use and an option to switch if the bandwidth is too low. If
-http is chosen, you will also see something regarding checksums.</para>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the
-other, and copy the checksum <link linkend="integrity">for later
-use</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
@@ -201,52 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
 algorithm from the file to be downloaded. You may compare the checksum of
 your downloaded ISO against that of the original source ISO. If the
 checksums do not match, it means that the actual data on the ISO's do not
-match, and if it is the case, then you should retry the download or attempt
-a repair using BitTorrent.</para>
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>To generate the checksum for your downloaded ISO, open a console, (no need
 to be root), and:</para>
       <itemizedlist>
         <listitem>
-          <para>To use md5sum, type: <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>To use sha1sum, type: <userinput>sha1sum
-path/to/the/image/file.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Example:</para>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Burn or dump the ISO</title>
-    <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
-stick. This is not a standard copy operation as a bootable medium will
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
 actually be created.</para>
     <section>
       <title>Burning the ISO to a CD/DVD</title>
-      <para>Whichever software you use, ensure that the option to burn an <emphasis
-role="bold">image</emphasis> is used, burn <emphasis
-role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not
-correct. See <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link> for more information.</para>
     </section>
     <section>
       <title>Dump the ISO to a USB stick</title>
-      <para>All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick
-and then use it to boot and install the system.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any existing data will be lost and the partition capacity will
-be reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>To recover the original capacity, you must redo partitioning and re-format
-the USB stick.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Using a graphical tool within Mageia</title>
         <para>You can use a graphical tool like <link
@@ -258,7 +296,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <itemizedlist>
           <listitem>
             <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -267,7 +305,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Using Command line within a GNU/Linux system</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk overwriting
 potentially valuable existing data if you specify the wrong target device.</para>
@@ -277,27 +315,27 @@ potentially valuable existing data if you specify the wrong target device.</para
             <para>Open a console</para>
           </listitem>
           <listitem>
-            <para>Become a root (Administrator) user with the command <userinput>su
--</userinput> (don't forget the final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Plug in your USB stick (do not mount it, this also means do not open any
-application or file manager that could access or read it)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Enter the command <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
             <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
             <para>Alternatively, you can find the device name with the command
-<code>dmesg</code>: towards the end of this example, you can see the device
-name starting with <emphasis>sd</emphasis>, and in this case,
-<emphasis>sdd</emphasis> is the actual device. You can also see that its
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
 size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
@@ -319,21 +357,22 @@ size is 2GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: <emphasis role="bold"># <userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Where X=your device name eg: /dev/sdd</para>
-            <para>Example:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-and <emphasis role="bold">of</emphasis> stands for <emphasis
-role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Enter the command: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>This is the end of the process, and you may now unplug your USB stick.</para>
@@ -342,4 +381,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/acceptLicense.xml b/docs/docs/stable/installer/hi/acceptLicense.xml
index ad3dfa3d..f85179fa 100644
--- a/docs/docs/stable/installer/hi/acceptLicense.xml
+++ b/docs/docs/stable/installer/hi/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">License and Release Notes</title>
   </info>
 
@@ -46,18 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">License Agreement</title>
     </info>
 
-    <para>Before installing <application>Mageia</application>, please read the license
-terms and conditions carefully.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>These terms and conditions apply to the entire
-<application>Mageia</application> distribution and must be accepted before
-you can continue.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>To proceed, simply select <guilabel>Accept</guilabel> and then click on
-<guibutton>Next</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>If you decide not to accept these conditions, then we thank you for
-looking. Clicking <guibutton>Quit</guibutton> will reboot your computer.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -75,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Important information about this release of
-<application>Mageia</application> can be viewed by clicking on the
-<guibutton>Release Notes</guibutton> button.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/addUser.xml b/docs/docs/stable/installer/hi/addUser.xml
index 3e8550c8..8e50d76d 100644
--- a/docs/docs/stable/installer/hi/addUser.xml
+++ b/docs/docs/stable/installer/hi/addUser.xml
@@ -1,32 +1,51 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hi" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">User and Superuser Management</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Set Administrator (root)  Password:</title>
     </info>
 
-    <para>It is advisable for all <application>Mageia</application> installations to
-set a <emphasis role="bold">superuser</emphasis> (administrator) password,
-usually called the <emphasis>root password</emphasis> in Linux. As you type
-a password into the top box a shield will change from red to yellow to green
-depending on the strength of the password. A green shield shows you are
-using a strong password. You need to repeat the same password in the box
-underneath, to check that the first entry was not mistyped.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>All passwords are case sensitive. It is best to use a mixture of letters
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
 (upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
@@ -36,43 +55,46 @@ underneath, to check that the first entry was not mistyped.</para>
       <title xml:id="enterUser-ti3">Enter a user</title>
     </info>
 
-    <para>Add a user here. A regular user has fewer privileges than the <emphasis
-role="bold">superuser</emphasis> (root), but enough to use the internet,
-office applications or play games and anything else the average user might
-use their computer for.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Icon</guibutton>: if you click on this button it will change the
-user's icon.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Real Name</guilabel>: Insert the user's real name into this text
-box.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use
-a version of the user's real name. <emphasis role="bold">The login name is
-case sensitive.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password</guilabel>: Type in the user password. There is a shield
-at the end of the text box that indicates the strength of the password. (See
-also <xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password (again)</guilabel>: Retype the user password DrakX will
-check that you have not mistyped the password.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Any users you added while installing Mageia, will have a home directory that
-is both read and write protected (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
@@ -82,32 +104,31 @@ management</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Advanced User Management</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>The <guibutton>Advanced</guibutton> option allows you to edit further
-settings for the user you are adding.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
-<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis>
-and <emphasis role="bold">Sh</emphasis></para>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the <emphasis
-role="bold">user ID</emphasis> for any user you added in the previous
-screen. If you are unsure what the purpose of this is, then leave it blank.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hi/add_supplemental_media.xml b/docs/docs/stable/installer/hi/add_supplemental_media.xml
index 1f779934..06427a7c 100644
--- a/docs/docs/stable/installer/hi/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/hi/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="hi">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Media Selection (Configure Supplemental Installation Media)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,43 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>This screen shows you the list of already recognized repositories. You can
-add other sources for packages, like an optical disc or a remote source.
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
 The source selection determines which packages will be available during the
-next steps.</para>
+subsequent steps.</para>
 
   <para>For a network source, there are two steps to follow:</para>
 
   <orderedlist>
     <listitem>
-      <para>Choosing and activation of the network, if not already up.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
       <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
 mirror, you have access to the selection of all repositories managed by
-Mageia, like the <emphasis role="bold">Nonfree</emphasis>, the <emphasis
-role="bold">Tainted</emphasis> repositories and the <emphasis
-role="bold">Updates</emphasis>. With the URL, you can designate a specific
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
 repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>If you are updating a 64 bit installation which may contain some 32 bit
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
 packages, it is advised to use this screen to add an online mirror by
-ticking one of the Network protocols here. The 64-bit DVD ISO only contains
-64-bit and noarch packages, it will not be able to update the 32-bit
-packages. However, after adding an online mirror, the installer will find
-the needed 32-bit packages there.</para>
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/ask_mntpoint_s.xml b/docs/docs/stable/installer/hi/ask_mntpoint_s.xml
index 9e666638..847713d0 100644
--- a/docs/docs/stable/installer/hi/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/hi/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="hi">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">माउंट बिंदु चुनें</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
 
   <para>Here you see the Linux partitions that have been found on your computer. If
-you don't agree with the <application>DrakX</application> suggestions, you
-can change the mount points.</para>
-
-  <note>
-    <para>If you change anything, make sure you still have a <emphasis
-role="bold"><literal>/</literal></emphasis> (root) partition.</para>
-  </note>
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis
-role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
-name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis>
-(for example, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>If you have several partitions, you can choose various different mount
-points from the drop down menu, such as <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis
-role="bold">/var</emphasis>. You can even make your own mount points, for
-instance <emphasis role="bold"><literal>/video</literal></emphasis> for a
-partition where you want to store your films, or <emphasis
-role="bold">/Data</emphasis> (or some other name) for your data.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -79,13 +82,17 @@ mount point field blank.</para>
   </itemizedlist>
 
   <warning>
-    <para>If you are not sure what to choose, click <emphasis
-role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
-disk partitioning</guilabel>, where, you can click on a partition to see its
-type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
   <para>If you are sure the mount points are correct, click on
-<guibutton>Next</guibutton>, and choose whether you only want to format the
-partition(s) DrakX suggests, or more.</para>
-</section>
\ No newline at end of file
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/hi/bestTime.xml b/docs/docs/stable/installer/hi/bestTime.xml
index a9681176..ef02c343 100644
--- a/docs/docs/stable/installer/hi/bestTime.xml
+++ b/docs/docs/stable/installer/hi/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hi" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="hi" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Clock settings</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>In this step, you have to select on which time your internal clock is set,
-either local time or UTC time.</para>
-
-  <para>In advanced tab, you will find more options about clock settings.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/bootLive.xml b/docs/docs/stable/installer/hi/bootLive.xml
index 7efe5b97..6f80dc29 100644
--- a/docs/docs/stable/installer/hi/bootLive.xml
+++ b/docs/docs/stable/installer/hi/bootLive.xml
@@ -1,29 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="hi"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">डिस्क द्वारा</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
-DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
-bootloader to launch the installation automatically after rebooting the
-computer. If that does not happen you may need to reconfigure your BIOS or
-press one key that will offer you to choose the peripheral from which the
-computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">यूएसबी डिवाइस द्वारा</title></info><para>You can boot from the USB device on which you dumped your image
-ISO. According to your BIOS settings, the computer boots perhaps directly on
-the USB device already plugged in a port. If that does not happen you may
-need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
-or USB stick) without writing anything on the disk, so expect a very slow
-system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
-when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
-the inserted installation medium. Here, select other sources, like FTP or
-NFS servers. If the installation is carried out in a network with an SLP
-server, select one of the installation sources available on the server with
-this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
-optional disk with a driver update and will require its insertion during
-installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice)  or to
-process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
-duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para><para>In each case, the first steps will be the same to choose language, timezone
-and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Booting the medium</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>First screen while booting in BIOS mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">In UEFI mode</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/hi/chooseDesktop.xml b/docs/docs/stable/installer/hi/chooseDesktop.xml
index caf24f98..49e4600e 100644
--- a/docs/docs/stable/installer/hi/chooseDesktop.xml
+++ b/docs/docs/stable/installer/hi/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hi" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">डेस्कटॉप चयन</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">डेस्कटॉप चयन</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide-show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> or <application>GNOME</application>
-desktop environment. Both come with a full set of useful applications and
-tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
-use both), or if you want to modify the default software choices for these
-desktop environments. The <application>LXDE</application> desktop, for
-instance, is lighter than the previous two, sporting less eye candy and
-fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/hi/choosePackageGroups.xml b/docs/docs/stable/installer/hi/choosePackageGroups.xml
index 9802d308..7f811576 100644
--- a/docs/docs/stable/installer/hi/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/hi/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hi" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hi" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">पैकेज समूह चयन</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/hi/choosePackagesTree.xml b/docs/docs/stable/installer/hi/choosePackagesTree.xml
index a5980bc6..4c2c4e2c 100644
--- a/docs/docs/stable/installer/hi/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/hi/choosePackagesTree.xml
@@ -1,21 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="hi">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="hi">
   <info>
     <title xml:id="choosePackagesTree-ti1">Choose Individual Packages</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-  <para>After having made your choice, you can click on the <guibutton>floppy
-icon</guibutton> at the bottom of the page to save your choice of packages
-(saving to a USB key works, too). You can then use this file to install the
-same packages on another system, by pressing the same button during install
-and choosing to load it.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/configureServices.xml b/docs/docs/stable/installer/hi/configureServices.xml
index 3f7d36c9..943873a4 100644
--- a/docs/docs/stable/installer/hi/configureServices.xml
+++ b/docs/docs/stable/installer/hi/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hi" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="hi" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">सेवाएँ विन्यस्त करें</title>
   </info>
@@ -7,20 +7,31 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose are usually good.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">If you highlight a service, some information about it is shown in the info
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">If you highlight a service, some information about it is shown in the info
 box below.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Only change things when you know very well what you are doing.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/configureTimezoneUTC.xml b/docs/docs/stable/installer/hi/configureTimezoneUTC.xml
index 4d5239d3..e9ab9c0e 100644
--- a/docs/docs/stable/installer/hi/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/hi/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="hi">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="hi">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">समयक्षेत्र विन्यस्त करें</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the
-same time-zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
 or to GMT, also known as UTC.</para>
diff --git a/docs/docs/stable/installer/hi/configureX_card_list.xml b/docs/docs/stable/installer/hi/configureX_card_list.xml
index bcbe5166..815c644b 100644
--- a/docs/docs/stable/installer/hi/configureX_card_list.xml
+++ b/docs/docs/stable/installer/hi/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="hi">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX has a very comprehensive database of video cards and will usually
 correctly identify your video device.</para>
@@ -29,33 +42,34 @@ correctly identify your video device.</para>
   <para>If the installer has not correctly detected your graphic card and you know
 which one you have, you can select it from the tree by: <itemizedlist>
       <listitem>
-        <para>vendor</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>then the name of your card</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>and the type of card</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-<emphasis role="bold">Xorg</emphasis> category, which provides more than 40
-generic and open source video card drivers. If you still can't find a
-specific driver for your card there is the option of using the <emphasis
-role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the <emphasis role="bold">Command-line</emphasis> Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the <emphasis role="bold">Nonfree</emphasis>
-repository and in some cases only from the card manufacturers' websites.</para>
-
-  <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be
-explicitly enabled to access them. If you didn't enable it previously, you
-should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/hi/configureX_chooser.xml b/docs/docs/stable/installer/hi/configureX_chooser.xml
index 098f5efd..9794630e 100644
--- a/docs/docs/stable/installer/hi/configureX_chooser.xml
+++ b/docs/docs/stable/installer/hi/configureX_chooser.xml
@@ -1,62 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="hi">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Graphic Card and Monitor Configuration</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym> or any other graphical environment to work well, the
-following <acronym>X</acronym> settings need to be correct. Choose the
-correct settings if none are shown, or if you think the details are
-incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card
-from the list if needed.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from
-the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose
-<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and
-vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Incorrect refresh rates may damage your monitor</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and
-color depth of your monitor can be set here.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the option is there, and you test your
-settings, you should be ask whether your settings are correct. If you answer
-<emphasis role="bold">yes</emphasis>, the settings will be kept. If you
-don't see anything, you'll return to the configuration screen and be able to
-reconfigure everything until the test result is satisfactory. If the test
-option is not available, then make sure your settings are on the safe side.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to
-enable or disable various options.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/hi/configureX_monitor.xml b/docs/docs/stable/installer/hi/configureX_monitor.xml
index 635acc01..1e7a307b 100644
--- a/docs/docs/stable/installer/hi/configureX_monitor.xml
+++ b/docs/docs/stable/installer/hi/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="hi">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,64 +23,82 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX has a very comprehensive database of monitors and will usually
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX has a very comprehensive database of monitors and will usually
 correctly identify yours.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
 could damage your monitor or video hardware. Please don't try something
 without knowing what you are doing.</emphasis> If in doubt you should
 consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Custom</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters, the vertical refresh
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
 rate and the horizontal sync rate. Vertical refresh determines how often the
 screen is refreshed and horizontal sync is the rate at which scan lines are
 displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
+        <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
 type with a sync range that is beyond the capabilities of your monitor: you
 may damage your monitor. If in doubt, choose a conservative setting and
 consult your monitor documentation.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">This is the default option and tries to determine the monitor type from the
-monitor database.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Vendor</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">If the installer has not correctly detected your monitor and you know which
-one you have, you can select it from the tree by selecting: <itemizedlist>
       <listitem>
-        <para>vendor</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>the monitor manufacturers name</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>the monitor description</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can select it from the tree by selecting:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Generic</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the <emphasis
-role="bold">Vesa</emphasis> card driver when your video hardware cannot be
-determined automatically. Once again it may be wise to be conservative in
-your selections.</para>
-</section>
\ No newline at end of file
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/hi/diskPartitioning.xml b/docs/docs/stable/installer/hi/diskPartitioning.xml
new file mode 100644
index 00000000..837d012a
--- /dev/null
+++ b/docs/docs/stable/installer/hi/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="hi" version="5.0" xml:lang="hi">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/diskdrake.xml b/docs/docs/stable/installer/hi/diskdrake.xml
index 255034f3..c876498c 100644
--- a/docs/docs/stable/installer/hi/diskdrake.xml
+++ b/docs/docs/stable/installer/hi/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hi" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Custom disk partitioning with DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis>
-partition you must ensure that you have a separate <emphasis
-role="bold">/boot</emphasis> partition. The encryption option for the
-<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise
-your system will be unbootable.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view their details before you start.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage
-device like a USB key). In the screen-shot above there are two available
-devices: <emphasis role="bold">sda </emphasis>and <emphasis
-role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if
-you are sure you want to wipe all partitions on the selected storage device.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Expert mode</guibutton> provides more options such as a label
-(give a name to) a partition, or to choose a partition type.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Click <guibutton>Done</guibutton> when you're ready.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
-Partition) is present and correctly mounted on /boot/EFI (see below)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/hi/doPartitionDisks.xml b/docs/docs/stable/installer/hi/doPartitionDisks.xml
index 52afb939..fd6e7142 100644
--- a/docs/docs/stable/installer/hi/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/hi/doPartitionDisks.xml
@@ -1,172 +1,214 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hi" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">विभाजनीकरण</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the
-DrakX partitioning proposals for where to install
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the
-layout and content of your particular hard drive(s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Use Existing Partitions</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">If this option is available, then existing Linux compatible partitions have
+      <para revision="1" xml:id="doPartitionDisks-pa5">If this option is available, then existing Linux compatible partitions have
 been found and may be used for the installation.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Use Free Space</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">If you have unused space on your hard drive then this option will use it for
+      <para revision="1" xml:id="doPartitionDisks-pa7">If you have unused space on your hard drive then this option will use it for
 your new Mageia installation.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Use Free Space on a Windows Partition</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">If you have unused space on an existing Windows partition, the installer may
-offer to use it.</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">This can be a useful way of making room for your new Mageia installation,
-but is a risky operation so you should make sure you have backed up all
-important files!</para>
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
 partition must be "clean", meaning that Windows must have closed down
 correctly the last time it was used. It must also have been defragmented,
 although this is not a guarantee that all files in the partition have been
 moved out of the area that is about to be used. It is highly recommended to
 back up your personal files.</para>
+      </important>
+    </listitem>
 
-        <para>With this option, the installer displays the remaining Windows partition in
-light blue and the proposed Mageia partition in dark blue with their
-intended sizes just underneath. You have the option to modify these sizes by
-clicking and dragging the gap between both partitions. See the following
-screen-shot.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Erase and use Entire Disk.</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">This option will allocate the entire drive for Mageia.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Note! This will erase ALL data on the selected hard drive. Take care!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">This gives you complete control over the placing of the installation on your
+hard drive(s).</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">If you intend to use part of the disk for something else, or you already
-have data on the drive that you are not prepared to lose, then do not use
-this option.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">ऐच्छिक डिस्क विभाजनीकरण</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">This gives you complete control over the placing of the installation on your
-hard drive(s).</para>
-      </listitem>
-    </itemizedlist></para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para>If you are not using the <emphasis role="bold">Custom disk
-partitioning</emphasis> option, the installer will allocate the available
-space according to the following rules:</para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>If the total available space is less than 50 GB, then only one partition is
-created. This will be the <emphasis role="bold">/</emphasis> (root)
-partition.</para>
-      </listitem>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-      <listitem>
-        <para>If the total available space is greater than 50 GB, then three partitions
-are created</para>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 of the total available place is allocated to <emphasis
-role="bold">/</emphasis> with a maximum of 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 is allocated to swap with a maximum of 4 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>the rest (at least 12/19) is allocated to <emphasis
-role="bold">/home.</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-  <para>That means that from 160 GB or greater available space, the installer will
-create three partitions: 50 GB for <emphasis role="bold">/</emphasis>, 4 GB
-for <emphasis role="bold">swap</emphasis> and the remainder for <emphasis
-role="bold">/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
-automatically detected - or created if it does not exist yet, and mounted on
-/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to
-create a BIOS boot partition if not already existing. It is a roughly 1 MiB
-partition with no mount point. Choose <xref linkend="diskdrake"/> to be able
-to create it with the Installer like any other partition, just select BIOS
-boot partition as the filesystem type.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512. Due to lack of available hardware, the
 partitioning tool used in the installer has not been tested with such a
-drive. Also some SSD devices now use an erase block size over 1 MB. If you
-have such a device we suggest that you partition the drive in advance, using
-an alternative partitioning tool like <emphasis
-role="bold">gparted</emphasis>, and to use the following settings:</para>
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/hi/exitInstall.xml b/docs/docs/stable/installer/hi/exitInstall.xml
index 73a91858..dc899d2e 100644
--- a/docs/docs/stable/installer/hi/exitInstall.xml
+++ b/docs/docs/stable/installer/hi/exitInstall.xml
@@ -5,23 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring
-<application>Mageia</application> and it is now safe to remove the
-installation medium and reboot your computer.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems (if there are more than one) on your computer.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the settings for the bootloader, your Mageia install
 will be automatically selected and started.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Enjoy!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Visit www.mageia.org if you have any questions or want to contribute to
-Mageia</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/firewall.xml b/docs/docs/stable/installer/hi/firewall.xml
index 48d4c035..90145a6d 100644
--- a/docs/docs/stable/installer/hi/firewall.xml
+++ b/docs/docs/stable/installer/hi/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="hi">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="hi" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">अग्नि-भीतिका</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">अग्नि-भीतिका</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
   <para>In the default setting (no button is checked), no service of the system is
-accessible from the network. The <emphasis role="bold">Everything (no
-firewall)</emphasis> enables access to all services of the machine - an
-option that does not make much sense in the context of the installer since
-it would create a totally unprotected system. Its veritable use is in the
-context of the Mageia Control Center (which uses the same GUI layout) for
-temporarily disabling the entire set of firewall rules for testing and
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
 debugging purposes.</para>
 
   <para>All other options are more or less self-explanatory. As an example, you will
-enable the <emphasis role="bold">CUPS server</emphasis> if you want printers
-on your machine to be accessible from the network.</para>
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where
-you can enable a series of services by typing a list of couples (blank
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
diff --git a/docs/docs/stable/installer/hi/formatPartitions.xml b/docs/docs/stable/installer/hi/formatPartitions.xml
index e341b89d..5fc202b6 100644
--- a/docs/docs/stable/installer/hi/formatPartitions.xml
+++ b/docs/docs/stable/installer/hi/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="hi">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formatting</title>
   </info>
@@ -11,32 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
 partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Usually at least the partitions DrakX selected, need to be formatted</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Click on <guibutton>Advanced</guibutton> to choose partitions you want to
-check for so called <emphasis>bad blocks</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen,
-where you can choose to view details of your partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">When you are confident about the selection, click on
-<guibutton>Next</guibutton> to continue.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/hi/graphicalConfiguration.xml b/docs/docs/stable/installer/hi/graphicalConfiguration.xml
new file mode 100644
index 00000000..1783c9d8
--- /dev/null
+++ b/docs/docs/stable/installer/hi/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/hi/installUpdates.xml b/docs/docs/stable/installer/hi/installUpdates.xml
index eb5c991d..790315e1 100644
--- a/docs/docs/stable/installer/hi/installUpdates.xml
+++ b/docs/docs/stable/installer/hi/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="hi">
-  <info>
-    <title xml:id="installUpdates-ti1">उन्नयन</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">उन्नयन</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of <application>Mageia</application> was released, some
-packages will have been updated or improved.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them,
-select <guilabel>No</guilabel> if you don't want to do this now, or if you
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
 aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Press <guibutton>Next</guibutton> to continue</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/installer.xml b/docs/docs/stable/installer/hi/installer.xml
index ff2bf15b..65fa63e4 100644
--- a/docs/docs/stable/installer/hi/installer.xml
+++ b/docs/docs/stable/installer/hi/installer.xml
@@ -6,165 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
   </info>
 
   <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
 Installer is designed to help make your installation or upgrade as easy as
 possible.</para>
 
-  <para>The initial menu screen has various options, however the default one will
-start the installer, which will normally be all that you will need.</para>
+  <section>
+    <title>The installation steps</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Installation Welcome Screen</title>
 
-    <section>
-      <title>Using a Mageia DVD</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>From this screen, you have access to options by pressing "<emphasis
-role="bold">e</emphasis>" to enter the edit mode. To come back to this
-screen, press either <emphasis role="bold">Esc</emphasis> key to quit
-without saving or press the key <emphasis role="bold">Ctrl</emphasis> or
-<emphasis role="bold">F10</emphasis> to quit with saving.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, it is possible to set some preferences (note that the
-options <emphasis role="bold">F1</emphasis> to <emphasis
-role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist>
-          <listitem>
-            <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis
-role="bold">F6</emphasis> options, you can view relevant help by pressing
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a
-specific language for the installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>If needed, change the screen resolution by pressing <emphasis
-role="bold">F3</emphasis> (Legacy mode only).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis role="bold">F6</emphasis> <emphasis
-role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis
-role="bold">e</emphasis> instead).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Default: It doesn't alter anything in the default options.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: Priority is given to the safer options at the price of a
-performance detriment.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI: (Advanced Configuration and Power Interface): Power management
-features are not used.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU
-interrupt. Select this option if you experience system misbehaviour like a
-kernel panic in relation to APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>When you select one of these entries, it modifies the default options
-displayed in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with
-<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot
-Options</guilabel> line, despite this, they will in fact be applied.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various
-boot options. Select an item with the arrow keys and press <emphasis
-role="bold">Enter</emphasis> for more details or press <emphasis
-role="bold">Esc</emphasis> to go back to the welcome screen.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>The detailed view about the splash option. Press <emphasis
-role="bold">Esc</emphasis> or select <guilabel>Return to Boot
-Options</guilabel> to go back to the options list. These options can be
-added by hand in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>For more information about kernel options on legacy and UEFI systems, see:
-<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>The installation steps</title>
+    <section>
+      <title>UEFI Systems</title>
 
-    <para>The install process is divided into a number of steps, the status of which
-is indicated in a panel to the left of the screen.</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
-options.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
-about the particular step.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
-is possible to reboot, but please think twice before you do this. Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -175,19 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>After the initial screen you did not reach the language selection
-screen. This can happen with some graphic cards and older systems. Try using
-low resolution by typing <code>vgalo</code> at the prompt.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this press <emphasis role="bold">Esc</emphasis> at the first welcome screen
-and confirm with <emphasis role="bold">ENTER</emphasis>. You will be
-presented with a black screen with the word "boot:". Type "text" and press
-<emphasis role="bold">ENTER</emphasis> to continue with the installation in
-text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -196,10 +196,10 @@ text mode.</para>
       <title>The Install Freezes</title>
 
       <para>If the system appeared to freeze during the installation, this may be a
-problem with hardware detection. In this case the automatic detection of
-hardware may be bypassed and dealt with later. To try this, type
-<code>noauto</code> at the prompt. This option may also be combined with
-other options as necessary.</para>
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -207,17 +207,18 @@ other options as necessary.</para>
 
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dynamic partitions</title>
 
-      <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis>
-format to <emphasis role="bold">dynamic</emphasis> format in Microsoft
-Windows, then it is not possible to install Mageia on this disc. To revert
-to a basic disk, see the Microsoft documentation: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/hi/locale.xml b/docs/docs/stable/installer/hi/locale.xml
new file mode 100644
index 00000000..ba58b1f8
--- /dev/null
+++ b/docs/docs/stable/installer/hi/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/hi/login.xml b/docs/docs/stable/installer/hi/login.xml
index 661c7c2e..a81b3a0d 100644
--- a/docs/docs/stable/installer/hi/login.xml
+++ b/docs/docs/stable/installer/hi/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="hi"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
-yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para><para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="hi">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/media_selection.xml b/docs/docs/stable/installer/hi/media_selection.xml
index 71483de6..958621ee 100644
--- a/docs/docs/stable/installer/hi/media_selection.xml
+++ b/docs/docs/stable/installer/hi/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="hi">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Media Selection (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Here you have the list of available repositories. Not all repositories are
 available, according to which media you use for installing. The repositories
@@ -35,7 +44,7 @@ the base of the distribution.</para>
       <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
 free-of-charge, i.e. Mageia may redistribute them, but they contain
 closed-source software (hence the name - Nonfree). For example this
-repository includes nVidia and ATI graphics card proprietary drivers,
+repository includes nVidia and AMD graphics card proprietary drivers,
 firmware for various WiFi cards, etc.</para>
     </listitem>
 
diff --git a/docs/docs/stable/installer/hi/minimal-install.xml b/docs/docs/stable/installer/hi/minimal-install.xml
index 09b94200..0d41c626 100644
--- a/docs/docs/stable/installer/hi/minimal-install.xml
+++ b/docs/docs/stable/installer/hi/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="hi">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="hi">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Minimal Install</title>
   </info>
@@ -10,26 +13,40 @@
 
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
-  <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+  
 
-  <para>Minimal Installation is intended for those with specific uses in mind for
-<application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the <emphasis
-role="bold">Individual package selection</emphasis> option mentioned above,
-to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>If you choose this installation method, then the relevant screen will offer
-you a few useful extras to install, such as documentation and X.</para>
+  
 
-  <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
 lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para>The basic documentation is provided in the form of man and info pages.  It
-contains the man pages from the <link
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
 Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
diff --git a/docs/docs/stable/installer/hi/misc-params.xml b/docs/docs/stable/installer/hi/misc-params.xml
index 2861971a..4751c2ed 100644
--- a/docs/docs/stable/installer/hi/misc-params.xml
+++ b/docs/docs/stable/installer/hi/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hi" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Summary of miscellaneous parameters</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
 
   <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
 the choices you made and on the hardware detected. You can check the
 settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>As a general rule, it is recommended that you accept the default settings
@@ -26,7 +42,7 @@ unless:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>some other factor mentionned in the detailed sections below is an issue.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,46 +54,47 @@ unless:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Timezone</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
 can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Country / Region</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
 setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Bootloader</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX has made good choices for the bootloader setting.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">For more information, see <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>User management</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each get their own
-<literal>/home</literal> directories.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Services</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
 (daemons).  This tool allows you to enable or disable certain processes.</para>
 
         <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
-prevent your computer from operating correctly.</para>
-
-        <para>For more information, see <xref linkend="configureServices"/></para>
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -89,7 +106,7 @@ prevent your computer from operating correctly.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Keyboard</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
 of keyboard.</para>
@@ -101,27 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Mouse</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add or configure other pointing devices, tablets, trackballs
 etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Sound card</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The
-option to select a different driver is only given when there is more than
-one driver for your card, but where none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Graphical interface</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphic card(s) and displays.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">For more information, see <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -136,11 +158,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Network</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, using the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
@@ -150,14 +172,14 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxies</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
         <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
-internet.  This section allows you to configure your computer to utilize a
+Internet.  This section allows you to configure your computer to utilize a
 proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -169,26 +191,31 @@ need to enter here.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Security Level</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Here you set the Security level for your computer, in most cases the default
-setting (Standard) is adequate for general use.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Check the option which best suits your usage.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Firewall</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">A firewall is intended to be a barrier between your important data and the
-rascals out there on the internet who would compromise or steal it.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing everything (no firewall) may be very risky.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/hi/reboot.xml b/docs/docs/stable/installer/hi/reboot.xml
index ba5570bb..ebb50b57 100644
--- a/docs/docs/stable/installer/hi/reboot.xml
+++ b/docs/docs/stable/installer/hi/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="hi" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">रीबूट</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/hi/securityLevel.xml b/docs/docs/stable/installer/hi/securityLevel.xml
index cf9449c9..a2f220ff 100644
--- a/docs/docs/stable/installer/hi/securityLevel.xml
+++ b/docs/docs/stable/installer/hi/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hi" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">सुरक्षा स्तर</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended
-setting for the average user. The <emphasis role="bold">Secure</emphasis>
-setting will create a highly protected system - for instance if the system
-is to be used as a public server.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Security Administrator</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
 which require notification to a system administrator.</para>
 
-  <para>A good, and easy-to-implement, choice is to enter &lt;user>@localhost -
-where &lt;user> is the login name of the user to receive these messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
 be configured for receiving such mail!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/hi/selectCountry.xml b/docs/docs/stable/installer/hi/selectCountry.xml
index b264b5af..9a8dd242 100644
--- a/docs/docs/stable/installer/hi/selectCountry.xml
+++ b/docs/docs/stable/installer/hi/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="hi">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="hi">
   <info>
     <title xml:id="selectCountry-ti1">Select your Country / Region</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> option and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem that a country from the
-first list was chosen. Please ignore this, as DrakX will apply your actual
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,7 +40,7 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Input method</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
@@ -39,9 +50,9 @@ selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via <emphasis role="bold">Configure
-your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
-running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/selectInstallClass.xml b/docs/docs/stable/installer/hi/selectInstallClass.xml
index 211592f7..9aae3b2a 100644
--- a/docs/docs/stable/installer/hi/selectInstallClass.xml
+++ b/docs/docs/stable/installer/hi/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="hi" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Install or Upgrade</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>संसाधन</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option to perform a fresh installation of
-<application>Mageia</application>. This will format the root partition (/),
-but can preserve a separated /home partition.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Upgrade</para>
-
-      <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that has reached
-its End Of Life, then it is better to do a clean install instead while
-preserving your <literal>/home</literal> partition.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that, and only if you are very sure
-rebooting is what you want, go to a text terminal by pressing <guilabel>Alt
-Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the <emphasis role="bold">Install or Upgrade</emphasis>
-screen to the language choice screen by pressing <guilabel>Alt Ctrl
-Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do
-this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hi/selectKeyboard.xml b/docs/docs/stable/installer/hi/selectKeyboard.xml
index b13d4b42..e52313fb 100644
--- a/docs/docs/stable/installer/hi/selectKeyboard.xml
+++ b/docs/docs/stable/installer/hi/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="hi">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,19 +19,22 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">कीबोर्ड</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX selects an appropriate keyboard for your language. If no suitable
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX selects an appropriate keyboard for your language. If no suitable
 keyboard is found it will default to a US keyboard layout.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Make sure that the selection is correct or choose another keyboard
+      <para revision="1" xml:id="selectKeyboard-pa2">Make sure that the selection is correct or choose another keyboard
 layout. If you don't know which layout your keyboard has, look in the
 specifications that came with your system, or ask the computer vendor. There
 may even be a label on the keyboard that identifies the layout. You can also
@@ -27,23 +43,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a fuller list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this and
-continue the installation: the keyboard chosen from the full list will be
-applied.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
 extra dialogue screen asking how you would prefer to switch between the
 Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hi/selectKeyboardLive.xml b/docs/docs/stable/installer/hi/selectKeyboardLive.xml
index 3b76a8f1..e7417c2d 100644
--- a/docs/docs/stable/installer/hi/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/hi/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hi" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Select keyboard</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>You will be required to set the keyboard layout you wish to use in
-Mageia​​. The default one is selected according to your language and
-timezone previously selected.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/hi/selectLanguage.xml b/docs/docs/stable/installer/hi/selectLanguage.xml
index b3830d1f..94b1d8ed 100644
--- a/docs/docs/stable/installer/hi/selectLanguage.xml
+++ b/docs/docs/stable/installer/hi/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hi" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,50 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">कृपया उपयोग में लायी जाने वाली एक भाषा का चयन करें ।</title>
   </info>
 
-  <para condition="classical">Select your preferred language, by first expanding the list for your
-continent. <application>Mageia</application> will use this selection during
-the installation and for your installed system.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">If it is likely that you (or others) will require several languages to be
-installed on your system, then you should use the <guibutton>Multiple
-languages</guibutton> option to add them now. It will be difficult to add
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
 extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
+  <important condition="classical">
     <para>Even if you choose more than one language, you must first choose one as your
-preferred language in the first language screen. It will also be marked as
-chosen in the multiple languages screen.</para>
-  </warning>
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
       <para>If your keyboard language is not the same as your preferred language, then
-it is advisable to install the language of your keyboard as well.</para>
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia uses UTF-8 (Unicode) support by default.</para>
-
-      <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple
-languages</emphasis> screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>You can change the language of your system after installation in the Mageia
-Control Center -> System -> Manage localization for your system.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hi/selectMouse.xml b/docs/docs/stable/installer/hi/selectMouse.xml
index 5854d93c..ba78aed7 100644
--- a/docs/docs/stable/installer/hi/selectMouse.xml
+++ b/docs/docs/stable/installer/hi/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="hi">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Select mouse</title>
   </info>
@@ -7,25 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">If you are not happy with how your mouse responds, you can select a
 different one here.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB
-mice</guilabel> is a good choice.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to
-configure the buttons that do not work on a mouse with six or more buttons.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/hi/setupBootloader.xml b/docs/docs/stable/installer/hi/setupBootloader.xml
index 79285241..1777696b 100644
--- a/docs/docs/stable/installer/hi/setupBootloader.xml
+++ b/docs/docs/stable/installer/hi/setupBootloader.xml
@@ -1,146 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="hi" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="hi" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">बूटलोडर के मुख्य विकल्प</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Bootloader interface</title>
-    <para>By default, Mageia uses exclusively:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot
-choose between the <emphasis role="bold">with</emphasis> or <emphasis
-role="bold">without graphical menu</emphasis> options.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to house the bootloader
-(GRUB2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds GRUB2-efi. Although it is possible to have
-several ESPs, only one is required (and advised), whatever the number of
-operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Using a Mageia bootloader</title>
-    <para>By default, and according to your system, Mageia writes one of the
-following:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then untick the <emphasis
-role="bold">Probe Foreign OS</emphasis> option.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
   <section>
-    <title>Using an existing bootloader</title>
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this documentation, however in most cases it will
-involve running the relevant bootloader installation program which should
-detect and add it automatically. See the documentation for the operating
-system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-  <section>
-    <title>विकल्पों</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>First page</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you
-set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be required when booting
-to select a booting entry or change settings. The username is <emphasis
-role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will
-check that it matches with the one above.</para></listitem><listitem><para><guilabel>Advanced</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for power management. It can save energy by
-stopping unused devices.  Deselecting it could be useful if, for example,
-your computer does not support ACPI or if you think the ACPI implementation
-might cause some problems (for instance random reboots or system lockups).</para></listitem><listitem><para><guilabel>Enable SMP</guilabel>: This option enables/disables symmetric
-multiprocessing for multi core processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the operating system access to
-the Advanced Programmable Interrupt Controller. APIC devices permit more
-complex priority models, and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC manages all external
-interrupts for a specific processor in an SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>बूटलोडर के मुख्य विकल्प</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Next page</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-to be used by the boot menu. If you click the down triangle you will be
-offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Using an existing bootloader</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Add or Modify a Boot Menu Entry</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/setupSCSI.xml b/docs/docs/stable/installer/hi/setupSCSI.xml
index 3aa6dbf2..7ada1618 100644
--- a/docs/docs/stable/installer/hi/setupSCSI.xml
+++ b/docs/docs/stable/installer/hi/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="hi">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Setup SCSI</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
 SCSI controllers it may be unable to determine the correct drivers to use
 and subsequently fail to recognise the drive.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s)
-you have.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">DrakX should then be able to configure the drive(s) correctly.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/hi/software.xml b/docs/docs/stable/installer/hi/software.xml
new file mode 100644
index 00000000..7a2bbffa
--- /dev/null
+++ b/docs/docs/stable/installer/hi/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="hi" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hi/soundConfig.xml b/docs/docs/stable/installer/hi/soundConfig.xml
index 0458ecae..683d6978 100644
--- a/docs/docs/stable/installer/hi/soundConfig.xml
+++ b/docs/docs/stable/installer/hi/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="hi">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Sound Configuration</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if one exists.</para>
+  
 
-  <para>The default driver should work without problems. However, if after install
-you do encounter problems, then run <command>draksound</command> or start
-this tool via MCC (Mageia Control Center), by choosing the
-<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound
-Configuration</guilabel> at the top right of the screen.</para>
+  
 
-  <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis
-role="bold">Sound Configuration</emphasis> tool screen, click on
-<guibutton>Troubleshooting</guibutton> to find useful advice about how to
-solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">उन्नत</title>
     </info>
 
-    <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in
-this screen, during install, is useful if there is no default driver and
-there are several drivers available, but you think the installer selected
-the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on <emphasis
-role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hi/takeOverHdConfirm.xml b/docs/docs/stable/installer/hi/takeOverHdConfirm.xml
index f63af81a..4189f4fa 100644
--- a/docs/docs/stable/installer/hi/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/hi/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="hi">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Confirm hard disk to be formatted</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is
-ok to erase every partition, every operating system and all data that might
-be on that hard disk.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/hi/testing.xml b/docs/docs/stable/installer/hi/testing.xml
index 7bd4dca1..f87bda8a 100644
--- a/docs/docs/stable/installer/hi/testing.xml
+++ b/docs/docs/stable/installer/hi/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testing Mageia as Live system</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Live mode</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>You get this screen if you selected "Boot Mageia". If not, you get the
-"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Testing hardware</title>
       </info>
 
-      <para>One of the Live mode goals is to test if the hardware is correctly managed
-by Mageia. You can check if all devices have a driver in the Hardware
-section of the Mageia Control Center. You can test the most current devices:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>graphical card: if you see the previous screen, it's already OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webcam:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>printer: configure it and print a test page</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
       </itemizedlist>
 
-      <para>If all is OK for you, you can process to the installation. If not, you can
-leave with the quit button.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>The configuration settings you made here are kept for the installation.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,15 +68,14 @@ leave with the quit button.</para>
         <title xml:id="testing3-ti1">Launch installation</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
-SSD drive, simply click on the icon "Install on Hard Disk". You will get
-this screen, and then the "<link
-linkend="doPartitionDisks">Partitioning</link> step" as for the direct
-installation.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/hi/uninstall-Mageia.xml b/docs/docs/stable/installer/hi/uninstall-Mageia.xml
index cabb3fe5..57789986 100644
--- a/docs/docs/stable/installer/hi/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/hi/uninstall-Mageia.xml
@@ -1,30 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="hi">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hi" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
   </info>
 
   
 
+  
+
   <para>If Mageia didn't convince you or you can't install it correctly - in short
 you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-  <para>After your data backup, reboot your Mageia installation DVD and select
-<emphasis role="bold">Rescue system</emphasis>, then, <emphasis
-role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
-will only have Windows, with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>In Windows to recover the space used by Mageia partitions: click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code>. You will recognize a Mageia partition
-because they are labeled <guilabel>Unknown</guilabel>, and also by their
-size and place on the disk. Right click on each of these partitions and
-select <guibutton>Delete</guibutton> to free up the space.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
   <para>If you are using Windows XP, you can create a new partition and format it
-(FAT32 or NTFS). It will get a partition letter.</para>
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>If you have Vista or 7, you have one more possibility, you can extend the
 existing partition that is at the left of the freed space. There are other
@@ -32,4 +45,4 @@ partitioning tools that can be used, such as <emphasis
 role="bold">gparted</emphasis>, available for both Windows and Linux. As
 always, when changing partitions, be very careful to back up anything
 important to you.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hi/unused.xml b/docs/docs/stable/installer/hi/unused.xml
index 62d0ae5b..fb3c4139 100644
--- a/docs/docs/stable/installer/hi/unused.xml
+++ b/docs/docs/stable/installer/hi/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hi" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="hi">
   <info>
     <title xml:id="unused-ti1">Keep or delete unused material</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para>In this step, the installer looks for unused locales packages and unused
-hardware packages. Then it proposes you to delete them. It is a good idea to
-accept, except if you prepare an installation which has to run on different
-hardware.</para>
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
+
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>The next step is the copying of files on hard disk. This takes some
-minutes. At the end, you get a blank screen for some time, it's normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/hr/DrakLive-cover.xml b/docs/docs/stable/installer/hr/DrakLive-cover.xml
index 5d158586..9fdca919 100644
--- a/docs/docs/stable/installer/hr/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/hr/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="hr" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="hr" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Installation from LIVE medium</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Veljača 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Installation from LIVE medium</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Službena dokumentacija za Mageiu</para>
+      <para role="tagline">Službena dokumentacija za Mageiu</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
+<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://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="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> 
+Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
+
   <article>
     <title>Installation from LIVE medium</title>
-       <para><note>
-          <para>No one will see all the installer screens that you see in this manual. Which
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
 screens you will see, depends on your hardware and the choices you make
 while installing.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/hr/DrakLive.xml b/docs/docs/stable/installer/hr/DrakLive.xml
index 0ad57446..276c4ccf 100644
--- a/docs/docs/stable/installer/hr/DrakLive.xml
+++ b/docs/docs/stable/installer/hr/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="hr" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="hr" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Installation from LIVE medium</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Installation from LIVE medium</title>
 
     <cover>
       <para><note>
@@ -17,7 +32,7 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 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
+      <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>
@@ -39,7 +54,12 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +69,18 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/hr/DrakX-cover.xml b/docs/docs/stable/installer/hr/DrakX-cover.xml
index 3ef1a67b..f96f738a 100644
--- a/docs/docs/stable/installer/hr/DrakX-cover.xml
+++ b/docs/docs/stable/installer/hr/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="hr" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="hr" xml:id="Quick-Startup"
+      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>Instalacija pomoću </title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Veljača 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Veljača 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Službena dokumentacija za Mageiu</para>
+      <para role="tagline">Službena dokumentacija za Mageiu</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
+
+      <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://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="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> 
+Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Instalacija pomoću </title>
-       <para><note>
-          <para>No one will see all the installer screens that you see in this manual. Which
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
 screens you will see, depends on your hardware and the choices you make
 while installing.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ while installing.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/hr/DrakX-inline.xml b/docs/docs/stable/installer/hr/DrakX-inline.xml
new file mode 100644
index 00000000..29a98f59
--- /dev/null
+++ b/docs/docs/stable/installer/hr/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="hr" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Instalacija pomoću </title>
+
+    <cover>
+      <para><note>
+          <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the 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>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>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/DrakX.xml b/docs/docs/stable/installer/hr/DrakX.xml
index b1ad93ee..d0ed837f 100644
--- a/docs/docs/stable/installer/hr/DrakX.xml
+++ b/docs/docs/stable/installer/hr/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="hr" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="hr" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Instalacija pomoću </title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Instalacija pomoću </title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ Team</link>, if you would like to help improve this manual.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ Team</link>, if you would like to help improve this manual.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ Team</link>, if you would like to help improve this manual.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ Team</link>, if you would like to help improve this manual.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/hr/SelectAndUseISOs2.xml b/docs/docs/stable/installer/hr/SelectAndUseISOs2.xml
index 3c50d904..219905d2 100644
--- a/docs/docs/stable/installer/hr/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/hr/SelectAndUseISOs2.xml
@@ -1,39 +1,74 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="hr" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
   </info>
   <section>
     <title>Uvod</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
-which image match your needs.</para>
-    <para>There is two families of media:</para>
+which image best suits your needs.</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: After booting the media, it will follow a process
-allowing to choose what to install and how to configure your target
-system. This give you the maximal flexibility for a customized installation,
-in particular to choose which Desktop Environment you will install.</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
       </listitem>
       <listitem>
-        <para>LIVE media: you can boot the media in a real Mageia system without
-installing it, to see what you will get after installation.  The
-installation process is simpler, but you get lesser choices.</para>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Details are given in the next sections.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Media</title>
     <section>
       <title>Definition</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support the ISO
-file is copied to.</para>
-      <para>You can find them <link
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
+      <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
     <section>
@@ -42,23 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the traditional installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
-            <para>They are able to make a clean install or an update from previous releases.</para>
+            <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 or 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Some tools are available in the Welcome screen: Rescue System, Memory Test,
-Hardware Detection Tool.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Each DVD contains many available desktop environments and languages.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>You'll be given the choice during the installation to add non free software.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -69,22 +106,20 @@ Hardware Detection Tool.</para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>Can be used to preview the distribution without installing it on a HDD, and
-optionally install Mageia on to your HDD.</para>
+            <para>Can be used to preview the Mageia operating system without having to install
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 or 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade from previous
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>They contain non free software.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -92,13 +127,13 @@ releases.</emphasis></para>
         <title>Live DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Plasma desktop environment only.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -106,13 +141,13 @@ releases.</emphasis></para>
         <title>Live DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>GNOME desktop environment only.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -120,39 +155,27 @@ releases.</emphasis></para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Xfce desktop environment only.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 or 64 bit architectures.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
     </section>
     <section>
-      <title>Boot-only CD media</title>
+      <title>Net install media</title>
       <section>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>Each one is a small image that contains no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient when
-bandwidth is too low to download a full DVD, a PC without a DVD drive or a
-PC that can't boot from a USB stick.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 or 64 bit architectures.</para>
-          </listitem>
-          <listitem>
-            <para>English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -160,8 +183,8 @@ PC that can't boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -169,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains non-free software (mostly drivers, codecs...) for people who need
-it.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -181,62 +203,88 @@ it.</para>
     <section>
       <title>Downloading</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
-BitTorrent. In both cases, a window gives you some information, such as the
-mirror in use and an opportunity to change if the bandwidth is to low. If
-http is chosen, you may also see something like</para>
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
-them. Keep one of them <link linkend="integrity">for further
-usage</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Check the radio button Save File.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
-      <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
-file to be downloaded. When you ask these algorithms to recalculate this
-number from your downloaded file, either you have the same number and your
-downloaded file is correct, or the number is different and you have a
-failure. A failure infers that you should retry the download or attempt a
-repair using BitTorrent.</para>
-      <para>Open a console, no need to be root, and:</para>
-      <para>- To use md5sum, type: [sam@localhost]$ <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
-      <para>- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum
-path/to/the/image/file.iso</userinput>.</para>
-      <para>and compare the obtained number on your computer (you may have to wait for a
-while) with the number given by Mageia. Example:</para>
+      <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
+      <para>To generate the checksum for your downloaded ISO, open a console, (no need
+to be root), and:</para>
+      <itemizedlist>
+        <listitem>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+        <listitem>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+      </itemizedlist>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para/>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Burn or dump the ISO</title>
-    <para>The checked ISO can now be burned to a CD or DVD or dumped to a USB
-stick. These operations are not a simple copy and aim to make a bootable
-medium.</para>
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
     <section>
       <title>Burning the ISO to a CD/DVD</title>
-      <para>Use whatever burner you wish but ensure the burning device is set correctly
-to <emphasis role="bold">burn an image</emphasis>, burn data or files is not
-correct. There is more information in <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
-wiki</link>.</para>
+wiki</link> for more information.</para>
     </section>
     <section>
       <title>Dump the ISO to a USB stick</title>
-      <para>All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick
-and then use it to boot and install the system.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any other data will be lost and the partition capacity will be
-reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>To recover the original capacity, you must redo partitioning and re-format
-the USB stick.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Using a graphical tool within Mageia</title>
         <para>You can use a graphical tool like <link
@@ -245,40 +293,51 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
       <section>
         <title>Using a graphical tool within Windows</title>
         <para>You could try:</para>
-        <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
-        <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
+        <itemizedlist>
+          <listitem>
+            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
+          </listitem>
+          <listitem>
+            <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
+Imager</link></para>
+          </listitem>
+        </itemizedlist>
       </section>
       <section>
-        <title>Using Command line within a GNU/Linux system</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
-          <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
-disc partition if you get the device-ID wrong.</para>
+          <para>It is potentially *dangerous* to do this by hand. You risk overwriting
+potentially valuable existing data if you specify the wrong target device.</para>
         </warning>
-        <para>You can also use the dd tool in a console:</para>
         <orderedlist>
           <listitem>
             <para>Open a console</para>
           </listitem>
           <listitem>
-            <para>Become root with the command <userinput>su -</userinput> (don't forget the
-final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Plug in your USB stick (do not mount it, this also means do not open any
-application or file manager that could access or read it)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Enter the command <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
-            <para>Alternatively, you can get the device name with the command
-<code>dmesg</code>: at end, you see the device name starting with
-<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
-            <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
+          </listitem>
+          <listitem>
+            <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+            <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
+            <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
 [72594.770536] usb 1-1: Product: Mass Storage Device
@@ -295,24 +354,28 @@ application or file manager that could access or read it)</para>
 [72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
 [72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
 [72595.967251]  <emphasis>sdd</emphasis>: sdd1
-[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
-          </listitem>
-          <listitem>
-            <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX
-bs=1M</userinput></para>
-            <para>Where X=your device name eg: /dev/sdc</para>
-            <para>Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
-of=/dev/sdb bs=1M</userinput></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
+            <tip>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
+            </tip>
           </listitem>
           <listitem>
-            <para>Enter the command: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
-            <para>Unplug your USB stick, it is done</para>
+            <para>This is the end of the process, and you may now unplug your USB stick.</para>
           </listitem>
         </orderedlist>
       </section>
diff --git a/docs/docs/stable/installer/hr/acceptLicense.xml b/docs/docs/stable/installer/hr/acceptLicense.xml
index 415d8d38..8bb9962d 100644
--- a/docs/docs/stable/installer/hr/acceptLicense.xml
+++ b/docs/docs/stable/installer/hr/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,33 +37,44 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Licenca i bilješka o izdanju</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
-revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
-</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
-revision="5" align="center" condition="live" format="PNG"
-fileref="live-license.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="acceptLicense-im1" fileref="dx2-license.png" align="center"
+revision="4"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-license.png" xml:id="acceptLicense-im2" revision="5"
+align="center" condition="live"/> </imageobject></mediaobject>
 
   <section xml:id="license">
     <info>
       <title xml:id="license-ti1">Ugovor o licenci</title>
     </info>
 
-    <para>Prijew instalacije <application>Mageie</application>, molim pročitajte
-pažljivo uvjete licence.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Ovi se uvjeti primjenjuju na cijelu <application>Mageia</application>
-distribuciju i moraju biti prihvaćeni prije nego što nastavite.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Za prihvaćanje jednostavno odaberite <guilabel>Prihvaćam</guilabel> i zatim
-kliknite na <guibutton>Slijedeće</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Ako odlučite ne prihvatiti ove uvjete, zahvaljujemo vam pto ste
-pogledali. Klikom na  <guibutton>Isključi</guibutton> ponovno ćete pokrenuti
-vaše računalo.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -75,7 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Da biste vidjeli što je novo u <application>Mageii</application>, kliknite
-na <guibutton>Bilješka o izdanju</guibutton> dugme.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/addUser.xml b/docs/docs/stable/installer/hr/addUser.xml
index 3b4861c2..8c47c258 100644
--- a/docs/docs/stable/installer/hr/addUser.xml
+++ b/docs/docs/stable/installer/hr/addUser.xml
@@ -1,104 +1,134 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="hr" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Upravljanje korisnikom i superkorisnikom</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
+
   
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Poostavi administratorsku (root) lozinku:</title>
     </info>
-    <para>Preporučljivo je za sve <application>Mageia</application> instalacije
-postavit isuperkorisničku ili administrativnu lozinku, koju obično nazivamo
-<emphasis>root lozinka</emphasis> u linuxu. dok upisujete lozinku u gornje
-polje boja štita će se mijenjati od crvene preko žute do zelene ovisno o
-jačini lozinke. Zeleni štit pokazuje da koristite jaku lozinku. Morate
-ponoviti lozinku u donjem polju, što provjerava da niste krivo napisali prvu
-lozinku uspoređujući ih.</para>
+
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
+
     <note xml:id="givePassword">
-      <para>Sve su lozinke osjetljive n avelika i mala slova, pa je najbolje koristiti
-mješavinu slova (velikih i malih), brojeva i ostalih znakova u lozinki.</para>
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
+
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Unesite korisnika</title>
     </info>
-    <para>Dodajte korisnika ovdje. korisnik ima manje ovlasti od superkorisnika
-(root), ali dovoljno da koristi internet,uredske programe ili igra igre i
-sve ostalo što prosječan korisnik radi sa svojim računalom.</para>
+
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
+
     <itemizedlist>
       <listitem>
-        <para><guibutton>Ikona</guibutton>: ako kliknete na ovo dugme promjeniti će ikonu
-korisnika.</para>
+        <para><emphasis role="bold">Icon</emphasis></para>
+
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Pravo ime</guilabel>: Umetni korisničko pravo ime u ovo tekstualno
-polje.</para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Ime prijave</guilabel>: Ovdje unesite korisnikovo ie prijave ili
-dopustite da drakx koristi verziju korisničkih pravih imena. <emphasis>Ime
-prijave je osjetljivo na mala i velika slova.</emphasis></para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Lozinka</guilabel>: U tekstualno polje trebate uppisati korisničku
-lozinku. Na kraju tekstualnog polja nalazi se štit koji pokazuje snagu
-lozinke.(Također vidi <xref linkend="givePassword"/>)</para>
-      </listitem>
-      <listitem>
-        <para><guilabel>Lozinka (ponovno)</guilabel>: Ponovno upišite korisničku lozinku u
-ovo tekstualno polje i drakx će provjeriti imate li istu lozinku u svakom
-tekstualnom polju.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
+
     <note>
-      <para>Bilo koji korisnik kojeg dodate tijekom instalacije Mageie, imati će imati
-će osobni direktorij zaštićen za pisanje i čitanje (umask=0027).</para>
-      <para>Možete dodati sve dodatne korisnike u <emphasis>Konfiguracija-
-Sažetak</emphasis> koraku tijekom instalacije . Odaberite
-<emphasis>Upravljanje korisnicima</emphasis>.</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
+
+      <para>You can add any extra needed users in the <emphasis>Configuration -
+Summary</emphasis> step during the install. Choose <emphasis>User
+management</emphasis>.</para>
+
       <para>Dozvole pristupa također se mogu promjeniti nakon instlacije.</para>
     </note>
   </section>
-  <section xml:id="addUserAdvanced" condition="classical">
+
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Napredno korisničko upravljanje</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
-    <para>Ako je  kliknuto na <guibutton>napredno</guibutton> dugme nudi vam se zaslon
-gdje možete urediti postavke korisnika kojega dodajete.</para>
-    <para condition="classical">Dodatno, možete onemogućiti ili omogućiti račun gosta.</para>
-    <warning condition="classical">
-      <para>Anything a guest with a default <emphasis>rbash</emphasis> guest account
-saves to his /home directory will be erased when he logs out.  The guest
-should save his important files to a USB key.</para>
-    </warning>
+
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
+
     <itemizedlist>
-      <listitem condition="classical">
-        <para><guilabel>Omogući račun gosta</guilabel>: Ovdje možete omogućiti ili
-onemogućiti račun gosta. Račun gosta dopušta gostu prijavu i korištenje
-PC-ja, ali ima ograničeniji pristup od normalnih korisnika.</para>
-      </listitem>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop down list allows you to change the
-shell used by the user you are adding in the previous screen, options are
-Bash, Dash and Sh</para>
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the user ID for the user you
-are adding in the previous screen. This is a number.  Leave it blank unless
-you know what you are doing.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a
-number, usually the same one as for the user. Leave it blank unless you know
-what you are doing.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hr/add_supplemental_media.xml b/docs/docs/stable/installer/hr/add_supplemental_media.xml
index 6c7a1567..dfa20594 100644
--- a/docs/docs/stable/installer/hr/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/hr/add_supplemental_media.xml
@@ -1,54 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hr" xml:id="add_supplemental_media"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="hr">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Odabir Medija (Konfiguracija dopunskog instalacijskog medija)</title>
-    </info>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
+  </info>
 
   
+
+  
+
+  
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
-<imageobject> <imagedata align="center"
-fileref="dx2-add_supplemental_media.png" format="PNG" revision="1"
-xml:id="dx2-add_supplemental_media-im1"/> </imageobject></mediaobject>
-
-  <para>Ovaj zaslon daje vam listu već prepoznatih repozitorija. MOžewte dodati
-ostale izvore za pakete, poput optičkoga diska ili udaljenog izvora. Odabir
-izvora određuje koji paketi će biti dostupni za odabir tijekom idućih
-koraka.</para>
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
+<imageobject> <imagedata format="PNG"
+fileref="dx2-add_supplemental_media.png"
+xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Za mrežni izvor, postoje dva koraka koja trba slijediti:</para>
 
   <orderedlist>
     <listitem>
-      <para>Odabir aktivacije mreže, ako već nije aktivna. </para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
-      <para>Odabir ogledala ili određenog URL (prvi unos). Odabirom ogledala imate
-pristup odabiru svih repozitorija uprave Mageia, poput Nonfree, sa Tainted
-spremištem i ažuriranjem. Sa URL možete odrediti određeni repozitorij ili
-vlastitu NFS instalaciju.</para>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
-    <note>
-      <para>Ako ažurirate 64 bitnu instalaciju koja može sadržavati 32 bitne pakete,
-preporučuje se da koristite ovaj zaslon za dodavanje mrežnog zrcala
-označavajuć jedan od prisutnig mrežnih protokola. DVD iso 64 bita sadrži
-samo 64 bitne i pakete bez određene arhitekture i neće moći ažurirati 32
-bitne pakete. Međutim, nakon dodavanja mrežnog zrcala instaler će prnaći
-potrebne 32 bitne pakete.</para>
-     </note>
-
-</section>
+  <note>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/ask_mntpoint_s.xml b/docs/docs/stable/installer/hr/ask_mntpoint_s.xml
index 03868d63..29ec03b0 100644
--- a/docs/docs/stable/installer/hr/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/hr/ask_mntpoint_s.xml
@@ -1,27 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="ask_mntpoint_s" version="5.0" xml:lang="hr">
-
+<section version="5.0" xml:lang="hr" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Odaberite mjesta montiranja</title>
   </info>
 
   
+
   
+
   
+
   
+
+  
+
+  
+
   
+
   
+
   
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -33,56 +44,55 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
-xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-chooseMountpoints.png" align="center" format="PNG"
-xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
-
-  <para>Ovdje možete vidjeti linux particije kje su nađene na vašem računalu. Ako se
-ne slažete sa <application>DrakX</application> sugerstijama, možete
-promjeniti točke montiranja.</para>
-
-  <note>
-    <para>Ako išta promjenite, budite sigurni da još uvijek imate <literal>/</literal>
-(root) particiju.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
 
-  <itemizedlist>
-    <listitem>
-      <para>Svaka particija je prikazana kao što slijedi:
-"Uređaj" ("Kapacitet", "Točka montiranja", "Vrsta").</para>
-    </listitem>
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
+  <itemizedlist>
     <listitem>
-      <para>"Uređaj" je napravljen od: "tvrdi disk", ["broj tvrdog diska"(slovo)], "broj
-particijer" (na primjer, "sda5").</para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
-    
     <listitem>
-      <para>Ako imate puno particija, možete izabrati mnogo različitih točaka montiranja
-iz padajućeg izbornika, kao što su  <literal>/</literal>,
-<literal>/home</literal> and <literal>/var</literal>. Možete čak napraviti
-vlastite točke montiranja, na primjer <literal>/video</literal> za particiju
-gdje želite pohraniti filmove, ili <literal>/cauldron-home</literal>
-za<literal>/home</literal> particiju cauldron instalacije.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
-      <para>Za particije kojima nemate pristup, možete ostaviti prazno polje točke
-montiranja.</para>
+      <para>For any partitions that you don't need to make use of, you can leave the
+mount point field blank.</para>
     </listitem>
   </itemizedlist>
 
   <warning>
-    <para>Izaberite  <guibutton>Prethodno</guibutton> ako niste sigurni što odabrati,
-i zatim označite <guilabel>Prilagođeno particioniranje diska</guilabel>. Na
-zalonu koji će uslijediti, kliknite na particiju da vidite vrstu i veličinu.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Ako ste sigurni da su točke montiranja ispravne, kliknite na
-<guibutton>Slijedeće</guibutton>, i izaberite želite li formatirati samo
-particiju(e) koje sugerira DrakX, ili više.</para>
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
 </section>
diff --git a/docs/docs/stable/installer/hr/bestTime.xml b/docs/docs/stable/installer/hr/bestTime.xml
index e3f414b7..e5d5e04e 100644
--- a/docs/docs/stable/installer/hr/bestTime.xml
+++ b/docs/docs/stable/installer/hr/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hr" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="hr" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Postavke sata</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>U ovom koraku morate odrediti na koje će vrijeme vaš interni sat biti
-postavljen. Lokalno iti UTC vrijeme.</para>
-
-  <para>U naprednoj kartici naći ćete još opcija o postavkama sata.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/bootLive.xml b/docs/docs/stable/installer/hr/bootLive.xml
index c792a09f..7549527e 100644
--- a/docs/docs/stable/installer/hr/bootLive.xml
+++ b/docs/docs/stable/installer/hr/bootLive.xml
@@ -1,29 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="hr"><info><title xml:id="bootLive-ti1">Podigni Mageia kao živi sustav</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Podižem medij</title></info><section><info><title xml:id="bootLive11-ti1">Sa diska</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
-DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
-bootloader to launch the installation automatically after rebooting the
-computer. If that does not happen you may need to reconfigure your BIOS or
-press one key that will offer you to choose the peripheral from which the
-computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">Sa USB uređaja</title></info><para>You can boot from the USB device on which you dumped your image
-ISO. According to your BIOS settings, the computer boots perhaps directly on
-the USB device already plugged in a port. If that does not happen you may
-need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
-or USB stick) without writing anything on the disk, so expect a very slow
-system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para></listitem><listitem><para>Instaliraj Mageia: Ovaj izbor će direktno instalirati Mageiu na tvrdi disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
-when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Pomoć. Objasni opcije "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Jezik. Odaberite jezik koji će biti prikazan na zaslonima.</para></listitem><listitem><para>F3 - Razlučivost zaslona. Birajte između, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
-the inserted installation medium. Here, select other sources, like FTP or
-NFS servers. If the installation is carried out in a network with an SLP
-server, select one of the installation sources available on the server with
-this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
-optional disk with a driver update and will require its insertion during
-installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">U UEFI načinu rada</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>Imate samo izbor između pokretanja Mageie u Live načinu rada (prvi izbor)
-ili instalacijski proces (drugi izbor).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
-duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para><para>U svakom slučaju, prvi koraci će biti izbor jezika, vremenska zona i
-tipkovnica, tada se proces razlikuje, sa <link linkend="testing">dodatnim
-koracima u Live načinu rada</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Podigni Mageia kao živi sustav</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Podižem medij</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>First screen while booting in BIOS mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">U UEFI načinu rada</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/hr/chooseDesktop.xml b/docs/docs/stable/installer/hr/chooseDesktop.xml
index 6d52a79b..b158bca6 100644
--- a/docs/docs/stable/installer/hr/chooseDesktop.xml
+++ b/docs/docs/stable/installer/hr/chooseDesktop.xml
@@ -1,27 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Odabir radnog okruženja</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Odabir radnog okruženja</title>
   </info>
 
   
 
-  <para>Ovisno o vašem odabiru, možda vam budu ponuđeni daljnji zasloni za fino
-ugađanje vašega izbora.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Odaberite želite li upotrebljavati <application>KDE</application> ili
-<application>Gnome</application> radno okruženje.Oba dolaze sa korisnim
-programima i alatima. Označite <guilabel>Prilagođeno</guilabel> ako ne
-želite koristiti nijedan ili oba, ili ako želite nešto drugo osim zadanog
-izbora softwarea za ova radna okruženja. <application>LXDE</application>
-radno okruženje je laganije nego prethodna dva, ali je manje oku privlačan
-sa manje paketa instaliranih na početku.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/hr/choosePackageGroups.xml b/docs/docs/stable/installer/hr/choosePackageGroups.xml
index 429f3901..18acf1c7 100644
--- a/docs/docs/stable/installer/hr/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/hr/choosePackageGroups.xml
@@ -1,39 +1,42 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Odabir grupe paketa</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
-  <para>Packages have been sorted into groups, to make choosing what you need on
+  <para>Packages are arranged into common groups, to make choosing what you need on
 your system a lot easier. The groups are fairly self explanatory, however
 more information about the content of each is available in tool-tips which
 become visible as the mouse is hovered over them.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Radna stanica</para>
+      <para><emphasis role="bold">Workstation</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Poslužitelj</para>
+      <para><emphasis role="bold">Server</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Grafičko okruženje</para>
+      <para><emphasis role="bold">Graphical Environment</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Odabir pojedinačnih paketa: Možete koristiti ovu opciju za ručno dodavanje
-ili uklanajnje paketa.</para>
+      <para><emphasis role="bold">Individual Package Selection</emphasis>: you can use
+this option to manually add or remove packages</para>
     </listitem>
   </itemizedlist>
 
-  <para>Pročitajte <xref linkend="minimal-install"/> uputstva kako napraviti
-minimalnu instalaciju (sa ili bez X &amp; IceWM).</para>
+  <para>See <xref linkend="minimal-install"/> for instructions on how to do a
+minimal install (without or with X &amp; IceWM).</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/choosePackagesTree.xml b/docs/docs/stable/installer/hr/choosePackagesTree.xml
index 9a18e9ab..f0d27056 100644
--- a/docs/docs/stable/installer/hr/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/hr/choosePackagesTree.xml
@@ -1,23 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="choosePackagesTree">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="hr">
+  <info>
+    <title xml:id="choosePackagesTree-ti1">Izaberi pojedinačne pakete</title>
+  </info>
 
-    <info>
-      <title xml:id="choosePackagesTree-ti1">Izaberi pojedinačne pakete</title>
-    </info>
+  
 
-    
+  
 
-<mediaobject>
-<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
-<imageobject> <imagedata fileref="dx2-choosePackagesTree.png" align="center"
-format="PNG" ></imagedata> </imageobject></mediaobject>
+  
 
-    <para>Ovdje možete dodati ili ukloniti dodatne pakete za prilagodbu vaše
-instalacije.</para>
+  <mediaobject>
+<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
+align="center"/> </imageobject></mediaobject>
 
-    <para>After having made your choice, you can click on the <guibutton>floppy
-icon</guibutton> at the bottom of the page to save your choice of packages
-(saving to a USB key works, too). You can then use this file to install the
-same packages on another system, by pressing the same button during install
-and choosing to load it.</para>
-  </section>
+  <para>Here you can add or remove any extra packages to customize your
+installation.</para>
 
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/configureServices.xml b/docs/docs/stable/installer/hr/configureServices.xml
index 95b5db54..cd85ecb4 100644
--- a/docs/docs/stable/installer/hr/configureServices.xml
+++ b/docs/docs/stable/installer/hr/configureServices.xml
@@ -1,40 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="configureServices" version="5.0" xml:lang="hr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="hr" xml:id="configureServices">
+  <info>
+    <title xml:id="configureServices-ti1">Konfigurirajte vaše servise</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="configureServices-ti1">Konfigurirajte vaše servise</title>
-    </info>
+  
 
-    
-   
+  
 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureServices.png"
-align="center" format="PNG" xml:id="configureServices-im1"></imagedata>
-</imageobject></mediaobject>
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
+xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
+  <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-    <para revision="1" xml:id="configureServices-pa1">Ovdje možete postaviti koje servise (ne) pokrenuti kada podignete vaš
-sustav.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-    <para revision="1" xml:id="configureServices-pa2">Postoje četiri grupe, kliknite na trokut ispred grupe za proširenje i vidite
-sve servise u grupi.</para>
-
-    <para revision="1" xml:id="configureServices-pa3">The setting DrakX chose are usually good.</para>
-
-    <para revision="1" xml:id="configureServices-pa4">If you highlight a service, some information about it is shown in the info
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">If you highlight a service, some information about it is shown in the info
 box below.</para>
+    </listitem>
+  </itemizedlist>
 
-    <para revision="1" xml:id="configureServices-pa5">Only change things when you know very well what you are doing.</para>
-  </section>
-
+  <para xml:id="configureServices-pa5" revision="1">Only change things when you know very well what you are doing.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/configureTimezoneUTC.xml b/docs/docs/stable/installer/hr/configureTimezoneUTC.xml
index 07cca07f..689c72ce 100644
--- a/docs/docs/stable/installer/hr/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/hr/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="configureTimezoneUTC">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="hr">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Konfigurirajte vremensku zonu</title>
   </info>
@@ -7,20 +7,30 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject condition="classical"> <imagedata
-xml:id="configureTimezoneUTC-im1" revision="1"
-fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
-</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
-condition="live" format="PNG"/> </imageobject></mediaobject>
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="configureTimezoneUTC-im1" align="center"
+fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa1">Odaberite vašu vremensku zonu birajući vašu državu ili grad blizu vas u
-istoj vremenskoj zoni.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa2">Na slijedećem zaslonu moći ćete postaviti sat vašega sklopovlja na lokalno
-vrijeme ili na GMT, također poznat kao UTC.</para>
+  <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
+or to GMT, also known as UTC.</para>
 
   <note>
     <para revision="1" xml:id="configureTimezoneUTC-pa3">Ako imate više operativinih sustava na vašem računalu, budite sigurni da su
diff --git a/docs/docs/stable/installer/hr/configureX_card_list.xml b/docs/docs/stable/installer/hr/configureX_card_list.xml
index c91f3944..7a96ee3a 100644
--- a/docs/docs/stable/installer/hr/configureX_card_list.xml
+++ b/docs/docs/stable/installer/hr/configureX_card_list.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="configureX_card_list">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
@@ -6,20 +13,28 @@
   
 
   
+
+  
+
+  
+
   
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-xml:id="configureX_card_list-im1" fileref="dx2-configureX_card_list.png"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX has a very comprehensive database of video cards and will usually
 correctly identify your video device.</para>
@@ -27,33 +42,34 @@ correctly identify your video device.</para>
   <para>If the installer has not correctly detected your graphic card and you know
 which one you have, you can select it from the tree by: <itemizedlist>
       <listitem>
-        <para>proizvođač</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>ime vaše kartice</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>vrsta kartice</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-Xorg category</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>The Xorg listing provides more than 40 generic and open source video card
-drivers. If you still can't find a named driver for your card there is the
-option of using the vesa driver which provides basic capabilities.</para>
-
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the Commandline Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the Nonfree repository and in some cases only from
-the card manufacturers' websites.</para>
-
-  <para>The Nonfree repository needs to be explicitly enabled to access them.  If
-you didn't select it previously, you should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/hr/configureX_chooser.xml b/docs/docs/stable/installer/hr/configureX_chooser.xml
index 5461a6ae..28b0e04c 100644
--- a/docs/docs/stable/installer/hr/configureX_chooser.xml
+++ b/docs/docs/stable/installer/hr/configureX_chooser.xml
@@ -1,64 +1,92 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="hr">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Konfiguracija grafičke kartice i monitora</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata revision="1" fileref="dx2-configureX_chooser.png"
-align="center" format="PNG" xml:id="configureX_chooser-im1"> </imagedata>
-</imageobject></mediaobject>
-
-  <para revision="1" xml:id="configureX_chooser-pa1">Bez obzira koje grafičko okruženje ( također poznato i kao desktop
-okruženje) izaberete za prvu instalaciju<application>Mageie</application>,
-svi su bazirani na grafičkom sučelju zvanom <acronym>X Window
-System</acronym>, ili jednostavno <acronym>X</acronym>. Da bi
-<acronym>KDE</acronym>, <acronym>Gnome</acronym>,<acronym>LXDE</acronym> ili
-bilo koje drugo grafičke sučelje radilo zadovoljavajuće slijedeće
-<acronym>X</acronym> postavke moraju biti ispravne.Izaberite ispravne
-postavke ako vidite da <application>DrakX</application> nije napravio izbor,
-ili ako mislite da je izbor neispravan.</para>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
+
+  <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis><guibutton>Grafička kartica</guibutton></emphasis>: Izaberite vašu
-grafičku karticu sa liste ako je potrebno.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor
-from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel>
-list. Choose <guilabel>Custom</guilabel> if you prefer to manually set the
-horizontal and vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para revision="1" xml:id="configureX_chooser-pa3a">Incorrect refresh rates may damage your monitor</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis><guibutton>Razlučivost</guibutton></emphasis>: Ovdje postavite
-željenu razlučivost i dubinu boja.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the button is there, you can control your
-settings by pressing it. If you see a question asking you whether your
-settings are correct, you can answer "yes", and the settings will be
-kept. If you don't see anything, you'll return to the configuration screen
-and be able to reconfigure everything until the test is good. <emphasis>Make
-sure your settings are on the safe side if the test button isn't
-available</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis><guibutton>Opcije</guibutton></emphasis>: Ovdje možete izabrati
-omogućavanje ili onemogućavanje raznih opcija.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
 </section>
diff --git a/docs/docs/stable/installer/hr/configureX_monitor.xml b/docs/docs/stable/installer/hr/configureX_monitor.xml
index 4c89f1db..b1afb108 100644
--- a/docs/docs/stable/installer/hr/configureX_monitor.xml
+++ b/docs/docs/stable/installer/hr/configureX_monitor.xml
@@ -14,11 +14,17 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
-<!-- lproof -->
+<!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Izaberite vaš monitor</title>
   </info>
 
@@ -26,58 +32,73 @@
 identificirati vaš.</para>
 
   <warning>
-    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis>Odabirom monitora drugih karakteristika možete oštetiti vaš
-monitor i video sklopovlje. Molim ne pokušavajte tako nešto ukoliko ne znate
-što radite.</emphasis> Ako imate sumnji savjetujte se sa dokumentacijom
-svoga monitora</para>
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
+could damage your monitor or video hardware. Please don't try something
+without knowing what you are doing.</emphasis> If in doubt you should
+consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
 format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa2"><emphasis>Prilagođeno</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters, the vertical refresh
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
 rate and the horizontal sync rate. Vertical refresh determines how often the
 screen is refreshed and horizontal sync is the rate at which scan lines are
 displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
+        <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
 type with a sync range that is beyond the capabilities of your monitor: you
 may damage your monitor. If in doubt, choose a conservative setting and
 consult your monitor documentation.</para>
+      </listitem>
+    </varlistentry>
 
-  <para revision="1" xml:id="configureX_monitor-pa5"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para revision="1" xml:id="configureX_monitor-pa6">Ovo je zadana opcija i pokušava odrediti vrstu monitora iz baze podataka
-monitora.</para>
-
-  <para revision="1"
-  xml:id="configureX_monitor-pa7"><emphasis>Proizvođač</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
-one you have, you can select it from the tree by selecting: <itemizedlist>
       <listitem>
-        <para>proizvođač</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>ime proizvođača monitora</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>opis monitora</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can select it from the tree by selecting:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa9"><emphasis>Generički</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para revision="1" xml:id="configureX_monitor-pa10">selecting this group displays nearly 30 display configurations such as
-1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the Vesa card driver
-when your video hardware cannot be determined automatically. Once again it
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
 may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 </section>
diff --git a/docs/docs/stable/installer/hr/diskPartitioning.xml b/docs/docs/stable/installer/hr/diskPartitioning.xml
new file mode 100644
index 00000000..72114b2f
--- /dev/null
+++ b/docs/docs/stable/installer/hr/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="hr" version="5.0" xml:lang="hr">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/diskdrake.xml b/docs/docs/stable/installer/hr/diskdrake.xml
index 9465b63d..cba4ef00 100644
--- a/docs/docs/stable/installer/hr/diskdrake.xml
+++ b/docs/docs/stable/installer/hr/diskdrake.xml
@@ -1,49 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" 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" version="5.0" xml:lang="hr" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Prilagođeno particioniranje diska pomoću DiskDrakea</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
+
   <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <literal>/</literal> partition you
-must ensure that you have a separate <literal>/boot</literal> partition. The
-encryption option for the <literal>/boot</literal> partition must NOT be
-set, otherwise your system will be unbootable.</para>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
   </warning>
-  <para xml:id="diskdrake-pa3" revision="2">Ovdje prilagodite raspored svojih disk(ova). Možete ukloniti ili napraviti
-particije, promijeniti datotečni sustav particije ili promijeniti njenu
-veličinu i čak i vidjeti što je na njima prije nego počnete.</para>
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab for every detected hard disk or other storage device, like an
-USB key. For example sda, sdb and sdc if there are three of them. </para>
-  <para xml:id="diskdrake-pa5" revision="1">Pritisnite <guibutton>Očisti sve</guibutton> za brisanje svih particija na
-odabranom uređaju za pohranu</para>
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert
-mode</guibutton>) gives some more tools like to add a label or to choose a
-partition type. </para>
-  <para xml:id="diskdrake-pa6a" revision="1">Nastavite dok ne prilagodite sve sukladno svojim željama.</para>
-  <para xml:id="diskdrake-pa7" revision="1">Kliknite na <guibutton>Učinjeno</guibutton> kada ste spremni.</para>
-  <note>
-    <para>If you are installing Mageia on an UEFI system, check that an ESP (EFI
-System Partition) is present and correctly mounted on /boot/EFI (see below)</para>
-    <para><mediaobject><imageobject condition="classical"><imagedata fileref="dx2-diskdrake2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-align="center" fileref="live-diskdrake2.png"/></imageobject></mediaobject></para>
-  </note>
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
-    <mediaobject>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
+
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
+
+  <figure>
+    <title>EFI System Partition</title>
+
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
+
+  <figure>
+    <title>BIOS boot partition</title>
+
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/hr/doPartitionDisks.xml b/docs/docs/stable/installer/hr/doPartitionDisks.xml
index e65d5a4a..360e2213 100644
--- a/docs/docs/stable/installer/hr/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/hr/doPartitionDisks.xml
@@ -1,82 +1,214 @@
-<?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:lang="hr" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+
   
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
 
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Particioniranje</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) and see the
-solutions the DrakX partitioning wizard found for where to install
-<application>Mageia</application>.</para>
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from the list below will vary depending on your
-particular hard drive(s) layout and content.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist><listitem><para revision="1" xml:id="doPartitionDisks-pa4">Koristi postojeće particije</para><para xml:id="doPartitionDisks-pa5" revision="1">If this option is available, then existing Linux compatible partitions have
-been found and may be used for the installation.</para></listitem><listitem><para xml:id="doPartitionDisks-pa6" revision="1">Koristi slobodni prostor</para><para xml:id="doPartitionDisks-pa7" revision="1">If you have unused space on your hard drive then this option will use it for
-your new Mageia installation.</para></listitem><listitem><para xml:id="doPartitionDisks-pa8" revision="1">Use Free Space on a Windows Partition</para><para xml:id="doPartitionDisks-pa9" revision="1">If you have unused space on an existing Windows partition, the installer may
-offer to use it.</para><para xml:id="doPartitionDisks-pa10" revision="2">This can be a useful way of making room for your new Mageia installation,
-but is a risky operation so you should make sure you have backed up all
-important files!</para><para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa5">If this option is available, then existing Linux compatible partitions have
+been found and may be used for the installation.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa7">If you have unused space on your hard drive then this option will use it for
+your new Mageia installation.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
+
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
+
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
 partition must be "clean", meaning that Windows must have closed down
 correctly the last time it was used. It must also have been defragmented,
 although this is not a guarantee that all files in the partition have been
 moved out of the area that is about to be used. It is highly recommended to
-back up your personal files.</para><para>With this option, the installer displays the remaining Windows partition in
-light blue and the future Mageia partition in dark blue with their intended
-sizes just under. You have the possibility to adapt these sizes by clicking
-and dragging the gap between both partitions. See the screen-shot below.</para><mediaobject><imageobject condition="classical"><imagedata
-fileref="dx2-doPartitionDisks2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-fileref="live-doPartitionDisks2.png" align="center"/></imageobject></mediaobject></listitem></itemizedlist> <itemizedlist><listitem><para xml:id="doPartitionDisks-pa12" revision="1">Izbriši i koristi cijeli disk.</para><para xml:id="doPartitionDisks-pa13" revision="1">Ova će opcija koristiti cijeli pogon za Mageiu.</para><para xml:id="doPartitionDisks-pa14" revision="1">Note! This will erase ALL data on the selected hard drive. Take care!</para><para xml:id="doPartitionDisks-pa15" revision="1">If you intend to use part of the disk for something else, or you already
-have data on the drive that you are not prepared to lose, then do not use
-this option.</para></listitem></itemizedlist><itemizedlist><listitem><para xml:id="doPartitionDisks-pa16" revision="1">Proizvoljno particioniranje diska</para><para xml:id="doPartitionDisks-pa17" revision="1">This gives you complete control over the placing of the installation on your
-hard drive(s).</para></listitem></itemizedlist></para>
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
-  <para>The installer will share the available place out according to the following
-rules:</para>
-  <para><itemizedlist><listitem><para>If the total available place is lower than 50 GB, only one partition is
-created for /, there is no separate partition for /home.</para></listitem><listitem><para>If the total available place is over 50 GB, then three partitions are
-created</para><itemizedlist><listitem><para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para></listitem><listitem><para>1/19 is allocated to swap with a maximum of 4 GB</para></listitem><listitem><para>the rest (at least 12/19) is allocated to /home</para></listitem></itemizedlist></listitem></itemizedlist></para>
-  <para>That means that from 160 GB and over of available place, the installer will
-create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.</para>
+back up your personal files.</para>
+      </important>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa17">This gives you complete control over the placing of the installation on your
+hard drive(s).</para>
+    </listitem>
+  </itemizedlist>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
+
   <note>
-    <para>If you are using an UEFI system, the ESP (EFI System Partition) will be
-automatically detected, or created if it does not exist yet, and mounted on
-/boot/EFI. The "Custom disk partitioning" option is the only one that allows
-to check it has been correctly done</para>
+    <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
-  <note>
-    <para>If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk,
-you need to create a Bios boot partition if not already existing. It is an
-about 1 MiB partition with no mount point. Choose <xref
-linkend="diskdrake"/> to be able to create it with the Installer like any
-other partition, just select BIOS boot partition as filesystem type.</para>
-    <mediaobject>
+
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
-  <warning>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
+
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
-previous standard of 512 byte logical sectors. Due to lack of available
-hardware, the partitioning tool used in the installer has not been tested
-with such a drive. Also some ssd drives now use an erase block size over 1
-MB. We suggest to pre-partition the drive, using an alternative partitioning
-tool like gparted, if you own such a device, and to use the following
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
 settings:</para>
-    <para>"Align to" "MiB"</para>
-    <para>"Free space preceding (MiB)" "2"</para>
-    <para>Also make sure all partitions are created with an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Also make sure all partitions are created using an even number of megabytes.</para>
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/hr/exitInstall.xml b/docs/docs/stable/installer/hr/exitInstall.xml
index 06fa2412..5f629f3c 100644
--- a/docs/docs/stable/installer/hr/exitInstall.xml
+++ b/docs/docs/stable/installer/hr/exitInstall.xml
@@ -1,19 +1,32 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xml:id="exitInstall" version="5.0" xml:lang="hr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0" xml:lang="hr">
   <info>
     <title xml:id="exitInstall-ti1">Čestitamo</title>
   </info>
+
   
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
-  <para xml:id="exitInstall-pa1" revision="2">Završili ste instaliranje i konfiguriranje <application>Mageie</application>
-i sada je sigurno ukloniti instalcijski medij i napraviti reboot računala.</para>
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems on your computer (if you have more than one).</para>
+
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
+
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
+
   <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the settings for the bootloader, your Mageia install
 will be automatically selected and started.</para>
+
   <para xml:id="exitInstall-pa4" revision="1">Uživajte!</para>
-  <para xml:id="exitInstall-pa5" revision="1">Visit www.mageia.org if you have any questions or want to contribute to
-Mageia</para>
+
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/firewall.xml b/docs/docs/stable/installer/hr/firewall.xml
index 433650f9..089b215e 100644
--- a/docs/docs/stable/installer/hr/firewall.xml
+++ b/docs/docs/stable/installer/hr/firewall.xml
@@ -1,33 +1,37 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="hr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="hr" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Vatrozid</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Vatrozid</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows to configure some simple firewall rules: they determine
-which type of message from the Internet will be accepted by the target
-system. This, in turn, allows the corresponding services on the system to be
-accessible from the Internet.</para>
+  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+determine which type of message from the Internet will be accepted by the
+target system. This, in turn, allows the corresponding services on the
+system to be accessible from the Internet.</para>
 
-  <para>In the default setting, no button is checked - no service of the system is
-accessibly from the network. The "<emphasis>Everything (no
-firewall)</emphasis>" button has a particular role: it enables access to all
-services of the machine - an option that does not make much sense in the
-context of the installer since it would create a totally unprotected
-system.  Its veritable use is in the context of the Mageia Control Center
-(which uses the same GUI layout) for temporarily disabling the entire set of
-firewall rules for testing and debugging purposes.</para>
+  <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
 
-  <para>All other checkbuttons are more or less self-explanatory. As an example, you
-will check the "CUPS server" button if you want printers on your machine to
-be accessible from the network.</para>
+  <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The set of checkbuttons only comprises the most common services. The
-"Advanced" button allows to enable messages that correspond to a service for
-which no checkbutton exists. The "<emphasis>Advanced</emphasis>" button
-opens a window where you can enable a series of services by typing a list of
-couples (blank separated)</para>
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
 
diff --git a/docs/docs/stable/installer/hr/formatPartitions.xml b/docs/docs/stable/installer/hr/formatPartitions.xml
index f1a295b7..30a8bfa1 100644
--- a/docs/docs/stable/installer/hr/formatPartitions.xml
+++ b/docs/docs/stable/installer/hr/formatPartitions.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="formatPartitions">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formatiram</title>
   </info>
@@ -7,41 +13,41 @@
   
 
   
+
   
+
   
+
   
-  
-  
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-formatPartitions.png" format="PNG" align="center"
-xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-formatPartitions.png" format="PNG" align="center"
-xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
-partitions <emphasis>not</emphasis> marked for formatting will be saved.</para>
+partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa2">Uobičajeno je da barem particije koje je odabrao DrakX moraju biti
-formatirane.</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa3">Click on <guibutton>Advanced</guibutton> to choose partitions you want to
-check for so called <emphasis>bad blocks</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
     <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen.
-In that screen you can choose to view what is in your partitions.</para>
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selection, click on
-<guibutton>Next</guibutton> to continue.</para>
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
 </section>
diff --git a/docs/docs/stable/installer/hr/graphicalConfiguration.xml b/docs/docs/stable/installer/hr/graphicalConfiguration.xml
new file mode 100644
index 00000000..6d370c08
--- /dev/null
+++ b/docs/docs/stable/installer/hr/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/hr/installUpdates.xml b/docs/docs/stable/installer/hr/installUpdates.xml
index 782ffdc8..d5086cd4 100644
--- a/docs/docs/stable/installer/hr/installUpdates.xml
+++ b/docs/docs/stable/installer/hr/installUpdates.xml
@@ -1,31 +1,46 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="hr">
+  
 
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="installUpdates"><info><title xml:id="installUpdates-ti1">Nadogradnje</title></info>
+  
 
+  
 
+  
 
+  
 
- 
- 
- 
+  
 
-   <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-installUpdates.png"
-format="PNG" align="center" xml:id="installUpdates-im1"></imagedata>
-</imageobject></mediaobject> 
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Nadogradnje</title>
+  </info>
 
- <para revision="1" xml:id="installUpdates-pa1">Since this version of <application>Mageia</application> was released, some
-packages will have been updated or improved.</para>
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
+align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="installUpdates-pa2">Choose <guilabel>yes</guilabel> if you wish to download and install them,
-select <guilabel>no</guilabel> if you don't want to do this now, or if you
-aren't connected to the Internet</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para revision="1" xml:id="installUpdates-pa3">Then press <guibutton>Next</guibutton> to continue</para>
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+    </listitem>
 
-</section>
-  
\ No newline at end of file
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/installer.xml b/docs/docs/stable/installer/hr/installer.xml
index 44fe623a..f5896d66 100644
--- a/docs/docs/stable/installer/hr/installer.xml
+++ b/docs/docs/stable/installer/hr/installer.xml
@@ -1,166 +1,169 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="installer">
-  <info>
-    <title xml:id="Select-and-use-ISOs-ti1">DrakX, Mageia instalacijski program</title>
-  </info>
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="installer"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
 
-  <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
-Installer is designed to help make your installation or upgrade as easy as
-possible.</para>
-
-  <para>The initial menu screen has various options, however the default one will
-start the installer, which will normally be all that you will need.</para>
+  
 
-  <section>
-    <title>Instalacijski zaslon dobrodošlice</title>
+  
 
-    <section>
-      <title>Using a Mageia DVD</title>
+  
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-with an UEFI system and the second one with a Legacy system:</para>
+  
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+  
 
-      <para>From this screen, you can access to options by pressing the "e" letter to
-enter the "edit mode". To come back to this screen, press either the key
-"esc" to quit without saving or press the key "Ctrl" or "F10" to quit with
-saving.</para>
+  
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
+  
 
-      <para>From this screen, it is possible to set some personal preferences:<itemizedlist>
-          <listitem>
-            <para>The language (for the installation only, may be different that the chosen
-language for the system) by pressing the key F2 (Legacy mode only)</para>
+  
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
+  
 
-            <para>Use the arrow keys to select the language and press the key Enter.</para>
+  <info>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, Mageia instalacijski program</title>
+  </info>
 
-            <para>Here is for example, the French welcome screen when using a Live
-DVD/CD. Note that the Live DVD/CD menu does not propose: <guilabel>Rescue
-System</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware
-Detection Tool</guilabel>.</para>
+  <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
+Installer is designed to help make your installation or upgrade as easy as
+possible.</para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome4fr.png"/> </imageobject></mediaobject>
-          </listitem>
+  <section>
+    <title>The installation steps</title>
 
-          <listitem>
-            <para>Change the screen resolution by pressing the F3 key (Legacy mode only).</para>
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
 
-          <listitem>
-            <para>Add some kernel options by pressing the <emphasis role="bold">F6</emphasis>
-key for the legacy mode or the <emphasis role="bold">e</emphasis> key for
-the UEFI mode.</para>
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
 
-            <para>If the installation fails, then it may be necessary to try again using one
-of the extra options. The menu called by F6 displays a new line called
-<guilabel>Boot options</guilabel> and propose four entries:</para>
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
-            <para>- Default, it doesn't alter anything in the default options.</para>
+  <section>
+    <title>Instalacijski zaslon dobrodošlice</title>
 
-            <para>- Default, it doesn't alter anything in the default options.</para>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-            <para>- No ACPI (Advanced Configuration and Power Interface), power management
-isn't taken into account.</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
 
-            <para>- No Local APIC (Local Advanced Programmable Interrupt Controller), it is
-about CPU interruptions, select this option if you are asked for.</para>
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
-            <para>When you select one of these entries, it modifies the default options
-displayed in the <guilabel>Boot Options</guilabel> line.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with the
-key F6 does not appear in the <guilabel>Boot Options</guilabel> line,
-however, they are really taken into account.</para>
-            </note>
+      <itemizedlist>
+        <title>Menu</title>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
 
-          <listitem>
-            <para>Add more kernel options by pressing the key F1 (Legacy mode only).</para>
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
 
-            <para>Pressing F1 opens a new window with more available options.  Select one with
-the arrow keys and press Enter to have more details or press the Esc key to
-go back to the welcome screen.</para>
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
 
-            <para>The detailed view about the option splash. Press Esc or select
-<guilabel>Return to Boot Options</guilabel> to go back to the options
-list. These options can by added by hand in the <guilabel>Boot
-options</guilabel> line.</para>
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
 
-            <note>
-              <para>The help is translated in the chosen language with the F2 key.</para>
-            </note>
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
 
-            <para>For more information about kernel options on legacy and UEFI systems, see:
-<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
 
     <section>
-      <title>Using a Wired Network</title>
-
-      <para>Here is the default welcome screen when using a Wired Network-based
-Installation CD (netinstall.iso or netinstall-nonfree.iso images):</para>
+      <title>UEFI Systems</title>
 
-      <para>It does not allow to change the language, the available options are
-described in the screen. For more information about using a Wired
-Network-based Installation CD, see <link
-ns2:href="https://wiki.mageia.org/en/Boot.iso_install">the Mageia
-Wiki</link></para>
-
-      <warning>
-        <para>The keyboard layout is the American one.</para>
-      </warning>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
       <mediaobject>
-<imageobject> <imagedata fileref="../dx-help.png"/> </imageobject></mediaobject>
-    </section>
-  </section>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-  <section>
-    <title>The installation steps</title>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <para>The install process is divided into a number of steps, which can be followed
-on the side panel of the screen.</para>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> buttons with extra, less commonly required,
-options.</para>
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons which give further
-explanations about the current step.</para>
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
 
-    <note>
-      <para>If somewhere during install you decide to stop the installation, it is
-possible to reboot, but please think twice before you do this.  Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -171,17 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>After the initial screen you did not reach the language selection
-screen. This can happen with some graphic cards and older systems. Try using
-low resolution by typing <code>vgalo</code> at the prompt.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this hit ESC at the first welcome screen and confirm with ENTER. You will be
-presented with a black screen with the word "boot:". Type "text" and hit
-ENTER. Now continue with the installation in text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -190,31 +196,30 @@ ENTER. Now continue with the installation in text mode.</para>
       <title>The Install Freezes</title>
 
       <para>If the system appeared to freeze during the installation, this may be a
-problem with hardware detection. In this case the automatic detection of
-hardware may be bypassed and dealt with later. To try this, type
-<code>noauto</code> at the prompt. This option may also be combined with
-other options as necessary.</para>
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
       <title>RAM problem</title>
 
-      <para>These will rarely be needed, but in some cases the hardware may report the
+      <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dynamic partitions</title>
 
-      <para>If you converted your hard disk from "basic" format to "dynamic" format on
-Microsoft Windows, you must know that it is impossible to install Mageia on
-this disc. To go back to a basic disk, see the Microsoft documentation:
-<link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
-
-  <section/>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hr/locale.xml b/docs/docs/stable/installer/hr/locale.xml
new file mode 100644
index 00000000..4c56cdd3
--- /dev/null
+++ b/docs/docs/stable/installer/hr/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/hr/login.xml b/docs/docs/stable/installer/hr/login.xml
index 1d0b3564..a436beeb 100644
--- a/docs/docs/stable/installer/hr/login.xml
+++ b/docs/docs/stable/installer/hr/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="hr"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
-yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para><para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="hr">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/media_selection.xml b/docs/docs/stable/installer/hr/media_selection.xml
index c8c5044b..f1a917c0 100644
--- a/docs/docs/stable/installer/hr/media_selection.xml
+++ b/docs/docs/stable/installer/hr/media_selection.xml
@@ -1,18 +1,31 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="hr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Media Selection (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
+
   
+
   
+
   
 
-<mediaobject>
+  
+  
+  <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
 <imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
 format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
@@ -31,7 +44,7 @@ the base of the distribution.</para>
       <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
 free-of-charge, i.e. Mageia may redistribute them, but they contain
 closed-source software (hence the name - Nonfree). For example this
-repository includes nVidia and ATI graphics card proprietary drivers,
+repository includes nVidia and AMD graphics card proprietary drivers,
 firmware for various WiFi cards, etc.</para>
     </listitem>
 
@@ -39,8 +52,8 @@ firmware for various WiFi cards, etc.</para>
       <para>The <emphasis>Tainted</emphasis> repository includes packages released under
 a free license. The main criteria for placing packages in this repository is
 that they may infringe patents and copyright laws in some countries,
-e.g. Multimedia codecs needed to play various audio/video files; packages
-needed to play commercial video DVD, etc.</para>
+e.g. multimedia codecs needed to play various audio/video files; packages
+needed to play commercial video DVD's, etc.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hr/minimal-install.xml b/docs/docs/stable/installer/hr/minimal-install.xml
index 38181b50..bb23c7c3 100644
--- a/docs/docs/stable/installer/hr/minimal-install.xml
+++ b/docs/docs/stable/installer/hr/minimal-install.xml
@@ -1,48 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hr" xml:id="minimal-install"
-         xmlns="http://docbook.org/ns/docbook"
-	 xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="hr">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Minimal Install</title>
   </info>
 
   
+
+  
+
+  
+
+  
+
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref
-linkend="choosePackageGroups"></xref>.</para>
-  <para>If desired, you can additionally tick the "Individual package selection"
-option in the same screen.</para>
   <para>Minimal Installation is intended for those with specific uses in mind for
-their <application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the "Individual
-package selection" option mentioned above, to fine-tune your installation,
-see <xref linkend="choosePackagesTree"></xref>.</para>
-  <para>If you choose this installation class, then the related screen will offer
-you a few useful extras to install, such as documentation and X.</para>
-  <para>If selected, "With X" will also include IceWM as lightweight desktop
-environment.</para>
-  <para>The basic documentation is provided in the form of man and info pages.  It
-contains the man pages from the <link
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
 Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
 coreutils</link> info pages.</para>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" fileref="dx2-minimal-install.png"
-align="center" format="PNG" xml:id="minimal-install-im1"></imagedata>
+<imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
+align="center" fileref="dx2-minimal-install.png" revision="1"/>
 </imageobject></mediaobject>
-
-  </section>
-
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/misc-params.xml b/docs/docs/stable/installer/hr/misc-params.xml
index 1b387065..36a49b30 100644
--- a/docs/docs/stable/installer/hr/misc-params.xml
+++ b/docs/docs/stable/installer/hr/misc-params.xml
@@ -1,22 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Summary of miscellaneous parameters</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
-
-  <para xml:id="misc-params-pa1" revision="1">DrakX made smart choices for the configuration of your system depending on
-the choices you made and on the hardware DrakX detected. You can check the
-settings here and change them if you want after pressing
-<guibutton>Configure</guibutton>.</para>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+  <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
 
   <note>
-    <para>As a general rule, default settings are recommended and you can keep them
-with 3 exceptions:<itemizedlist>
+    <para>As a general rule, it is recommended that you accept the default settings
+unless:<itemizedlist>
         <listitem>
           <para>there are known issues with a default setting</para>
         </listitem>
@@ -26,7 +42,7 @@ with 3 exceptions:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>something else is said in the detailed sections below</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,47 +54,47 @@ with 3 exceptions:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Timezone</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selected a time zone for you, depending on your preferred
-language. You can change it if needed. See also <xref
-linkend="configureTimezoneUTC"/></para>
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Country / Region</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
-        <para xml:id="misc-params-system-pa3a" revision="1">If you are not in the selected country, it is very important that you
-correct the setting. See <xref linkend="selectCountry"/></para>
+        <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
+setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Bootloader</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX has made good choices for the bootloader setting.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure Grub2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">For more information, see <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>User management</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each get their own
-<literal>/home</literal> directories.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Services</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
-        <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run the background
-(daemons). This tool allows you to enable or disable certain tasks.</para>
+        <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
+(daemons).  This tool allows you to enable or disable certain processes.</para>
 
         <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
-prevent your computer from operating correctly.</para>
-
-        <para>For more information, see <xref linkend="configureServices"/></para>
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -90,10 +106,10 @@ prevent your computer from operating correctly.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Keyboard</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa1a" revision="1">This is where you setup or change your keyboard layout which will depend on
-your location, language or type of keyboard.</para>
+        <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
+of keyboard.</para>
 
         <note>
           <para>If you notice a wrong keyboard layout and want to change it, keep in mind
@@ -102,27 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Mouse</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add or configure other pointing devices, tablets, trackballs
 etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Sound card</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver, if there is a default one. The option
-to select a different driver is only given when there is more than one
-driver for your card, but none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Graphical interface</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphic card(s) and displays.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">For more information, see <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -137,28 +158,28 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Network</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, in the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
-          <para xml:id="misc-params-network-pa3" revision="1">When you add a network card, do not forget to set your firewall to watch
+          <para xml:id="misc-params-network-pa3" revision="1">When you add a network card, do not forget to set your firewall to monitor
 that interface as well.</para>
         </warning>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxies</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
         <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
-internet.  This section allows you to configure your computer to utilize a
+Internet.  This section allows you to configure your computer to utilize a
 proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -170,26 +191,31 @@ need to enter here</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Security Level</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Here you set the Security level for your computer, in most cases the default
-setting (Standard) is adequate for general use.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Check the option which best suits your usage.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Firewall</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">A firewall is intended to be a barrier between your important data and the
-rascals out there on the internet who would compromise or steal it.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing everything (no firewall) may be very risky.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/hr/reboot.xml b/docs/docs/stable/installer/hr/reboot.xml
index 2810240e..5028e0bb 100644
--- a/docs/docs/stable/installer/hr/reboot.xml
+++ b/docs/docs/stable/installer/hr/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="hr" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Ponovno pokretanje sustava</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/hr/securityLevel.xml b/docs/docs/stable/installer/hr/securityLevel.xml
index f2e089a7..a1863fe9 100644
--- a/docs/docs/stable/installer/hr/securityLevel.xml
+++ b/docs/docs/stable/installer/hr/securityLevel.xml
@@ -1,32 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="securityLevel" version="5.0" xml:lang="hr">
+<section version="5.0" xml:lang="hr" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="securityLevel-ti1">Sigurnosna Razina</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="securityLevel-ti1">Sigurnosna Razina</title>
-    </info>
+  
 
- 
- 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-securityLevel.png"
-align="center" format="PNG" xml:id="securityLevel-im1"></imagedata>
-</imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
-    <para revision="1" xml:id="securityLevel-pa1">You can adjust your security level here.</para>
+  <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-    <para revision="1" xml:id="securityLevel-pa2">Leave the default settings as they are, if you don't know what to choose.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
 
-    <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> part of the Mageia Control Center.</para>
-  </section>
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
+  <para><emphasis role="bold">Security Administrator</emphasis></para>
+
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
+send <emphasis>security alert messages</emphasis> when it detects situations
+which require notification to a system administrator.</para>
+
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
+
+  <note>
+    <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
+messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
+be configured for receiving such mail!</para>
+  </note>
+
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/hr/selectCountry.xml b/docs/docs/stable/installer/hr/selectCountry.xml
index e2dfdeed..cf51768c 100644
--- a/docs/docs/stable/installer/hr/selectCountry.xml
+++ b/docs/docs/stable/installer/hr/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="hr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="hr">
   <info>
     <title xml:id="selectCountry-ti1">Select your Country / Region</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> button and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem a country from the
-first list was chosen. Please ignore this, DrakX will follow your real
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,18 +40,19 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Input method</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
-manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar
+manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
 functions and can be installed if you added HTTP/FTP media before package
 selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via "Configure your Computer" ->
-"System", or by running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/selectInstallClass.xml b/docs/docs/stable/installer/hr/selectInstallClass.xml
index 0e032775..145bf21c 100644
--- a/docs/docs/stable/installer/hr/selectInstallClass.xml
+++ b/docs/docs/stable/installer/hr/selectInstallClass.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- 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="hr" xml:id="selectInstallClass">
+<section version="5.0" xml:lang="hr" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
 
   
 
@@ -14,6 +15,13 @@
   
 
   
+
+  
+
+  
+
+  
+
   
 
   <info>
@@ -23,52 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Install or Upgrade</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectInstallClass.png" align="center"
-format="PNG"></imagedata> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Instaliraj</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option for a fresh <application>Mageia</application> installation.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Upgrade</para>
-
-      <para>If you have one or more <application>Mageia</application> installations on
-your system, the installer will allow you to upgrade one of them to the
-latest release.</para>
-
-<warning>
-	<para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that had already
-reached its End	Of Life when this one was released, then it is better to do
-a clean install while preserving your <literal>/home</literal> partition.</para>
-</warning>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
+
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that you are very sure rebooting is what you
-want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl
-F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the "Install or Upgrade" screen to the language choice
-screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do
-<emphasis>not</emphasis> do this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
 </section>
diff --git a/docs/docs/stable/installer/hr/selectKeyboard.xml b/docs/docs/stable/installer/hr/selectKeyboard.xml
index 116e578a..70f9fe2d 100644
--- a/docs/docs/stable/installer/hr/selectKeyboard.xml
+++ b/docs/docs/stable/installer/hr/selectKeyboard.xml
@@ -10,9 +10,18 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Tipkovnica</title>
   </info>
 
@@ -20,7 +29,7 @@
 keyboard is found it will default to a US keyboard layout.</para>
 
   <mediaobject>
-<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png" />
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
@@ -34,23 +43,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a full list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this anomaly
-and continue the installation: Your keyboard is the one you chose from the
-full list.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
       <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
-extra dialog screen asking how you would prefer to switch between the Latin
-and non-Latin keyboard layouts</para>
+extra dialogue screen asking how you would prefer to switch between the
+Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/hr/selectKeyboardLive.xml b/docs/docs/stable/installer/hr/selectKeyboardLive.xml
index eee27122..5464c00b 100644
--- a/docs/docs/stable/installer/hr/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/hr/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Select keyboard</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>You will be required to set the keyboard layout you wish to use in
-Mageia​​. The default one is selected according to your language and
-timezone previously selected.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/hr/selectLanguage.xml b/docs/docs/stable/installer/hr/selectLanguage.xml
index b29e9b9d..faaa2505 100644
--- a/docs/docs/stable/installer/hr/selectLanguage.xml
+++ b/docs/docs/stable/installer/hr/selectLanguage.xml
@@ -1,9 +1,33 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="hr" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
   
+
   
+
   
+
   
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 04 01, using barjac's text -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -12,41 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Molim izaberite jezik koji želite koristiti</title>
   </info>
-  <para condition="classical">Select your preferred language, by first expanding the list for your
-continent. <application>Mageia</application> will use this selection during
-the installation and for your installed system.</para>
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
-  <para condition="classical">If it is likely that you will require several languages installed on your
-system, for yourself or other users, then you should use the
-<guibutton>Multiple languages</guibutton> button to add them now. It will be
-difficult to add extra language support after installation.</para>
+
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
+
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
+
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
-  <warning condition="classical">
-    <para>Even if you choose more than one language, you must first choose one of them
-as your preferred language in the first language screen. It will also be
-marked as chosen in the multiple languages screen .</para>
-  </warning>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
+
   <itemizedlist>
     <listitem condition="classical">
       <para>If your keyboard language is not the same as your preferred language, then
-it is advisable to install the language of your keyboard as well.</para>
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
+
     <listitem>
-      <para>Mageia uses UTF-8 (Unicode) support by default.</para>
-      <para condition="classical">This may be disabled in the "multiple languages" screen if you know that it
-is inappropriate for your language. Disabling UTF-8 applies to all installed
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
 languages.</para>
     </listitem>
+
     <listitem>
-      <para>You can change the language of your system after installation in the Mageia
-Control Center -> System -> Manage localization for your system.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hr/selectMouse.xml b/docs/docs/stable/installer/hr/selectMouse.xml
index b1965c48..0e0c64f4 100644
--- a/docs/docs/stable/installer/hr/selectMouse.xml
+++ b/docs/docs/stable/installer/hr/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="hr">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Select mouse</title>
   </info>
@@ -7,25 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">If you are not happy with how your mouse responds, you can select a
 different one here.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB
-mice</guilabel> is a good choice.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to
-configure the buttons that do not work on a mouse with six or more buttons.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/hr/setupBootloader.xml b/docs/docs/stable/installer/hr/setupBootloader.xml
index a2044b87..c434670c 100644
--- a/docs/docs/stable/installer/hr/setupBootloader.xml
+++ b/docs/docs/stable/installer/hr/setupBootloader.xml
@@ -1,228 +1,198 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="hr" xml:id="setupBootloader">
+  
+  
+  
+  
   
-
   
-
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Glavne postavke bootloadera</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
-
   <section>
-    <title>Bootloader interface</title>
-
-    <para>By default, Mageia uses exclusively:</para>
-
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-
-    <section>
-      <title>Grub2 on Legacy/MBR and Legacy/GPT systems</title>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-
-      <para>Don't modify the "Boot Device" unless you really know what you are doing.</para>
-    </section>
-
-    <section>
-      <title>Grub2-efi on UEFI systems</title>
-
-      <para>With an UEFI system, the user interface is slightly different as you cannot
-choose between with or without graphical menu</para>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to receive the bootloader
-(Grub2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds grub2-efi. Although it is possible to have
-several ESPs, only one is advised and enough whatever the number of
-operating systems you have.</para>
-
-      <para>Don't modify the "Boot Device" unless you really know what you are doing.</para>
-    </section>
-  </section>
-
-  <section>
-    <title xml:id="setupMageiaBootloader">Using a Mageia bootloader</title>
-
-    <para>By default, according to your system, Mageia writes a new:</para>
-
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard
-drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then uncheck the box
-<guilabel>Probe Foreign OS</guilabel></para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
-  </section>
-
-  <section>
-    <title>Using an existing bootloader</title>
-
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this help, however in most cases it will involve
-running the relevant bootloader installation program which should detect and
-add it automatically. See the documentation for the operating system in
-question.</para>
-  </section>
-
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-
-    <para>If you don't want a bootable Mageia, but to chain load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
   </section>
-
   <section>
-    <title>Opcije</title>
-
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>First page</title>
-
-      <para><itemizedlist>
-          <listitem>
-            <para><guilabel>Delay before booting the default image</guilabel>: This text box
-lets you set a delay in seconds before the default operating system is
-started up.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be asked at the boot
-time to select a booting entry or change settings. The username is "root"
-and the password is the one chosen here after.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Password</guilabel>: This text box is where you actually put the
-password</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Password (again)</guilabel>: Retype the password and Drakx will
-check that it matches with the one set above.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Advanced</guilabel></para>
-
-            <itemizedlist>
-              <listitem>
-                <para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for the power management. It can save energy by
-stopping unused devices, this was the method used before APM. Unchecking it
+      <title>Glavne postavke bootloadera</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable SMP</guilabel>: This option enables / disables symmetric
-multiprocessing for multi core processors.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the
-operating system access to the Advanced Programmable Interrupt
-Controller. APIC devices permit more complex priority models, and Advanced
-IRQ (Interrupt Request)  management.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which
-manages all external interrupts for a specific processor in an SMP system.</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist></para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
-
     <section>
-      <title>Next page</title>
-
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
-
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist>
-              <listitem>
-                <para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-the boot menu will use. If you click the down triangle you will be offered
-other size and colour depth options.</para>
-              </listitem>
-
-              <listitem>
-                <para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para>
-              </listitem>
-            </itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Using an existing bootloader</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Add or Modify a Boot Menu Entry</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/setupBootloaderAddEntry.xml b/docs/docs/stable/installer/hr/setupBootloaderAddEntry.xml
index 3ca748e2..92c1652f 100644
--- a/docs/docs/stable/installer/hr/setupBootloaderAddEntry.xml
+++ b/docs/docs/stable/installer/hr/setupBootloaderAddEntry.xml
@@ -1,15 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns5="http://www.w3.org/2000/svg" version="5.0" xml:lang="hr" xml:id="setupBootloaderAddEntry">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="setupBootloaderAddEntry">
   
+
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
 
 Lebarhon 2016 12 16 Updated for Mageia 6-->
 <title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
   </info>
-  <para>To do that you need to manually edit /boot/grub2/custom.cfg or use the
-software grub-customizer instead (Available in the Mageia repositories).</para>
+
+  <para>To do this you need to manually edit /boot/grub2/custom.cfg or use the
+software <emphasis role="bold">grub-customizer</emphasis> tool instead
+(available in the Mageia repositories).</para>
+
   <note>
-    <para>For more information, see our wiki: <link
+    <para>For more information, see: <link
 ns2:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
   </note>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/setupSCSI.xml b/docs/docs/stable/installer/hr/setupSCSI.xml
index 16f935b6..5e22c7c2 100644
--- a/docs/docs/stable/installer/hr/setupSCSI.xml
+++ b/docs/docs/stable/installer/hr/setupSCSI.xml
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="setupSCSI" version="5.0" xml:lang="hr">
-
+<section version="5.0" xml:lang="hr" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Setup SCSI</title>
   </info>
 
   
+
   
+
   
+
   
-   
+
   
+
   
+
   
+
   
+
   
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- JohnR - edited 2012-03-03 -->
@@ -30,16 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata revision="1" fileref="dx2-setupSCSI.png"
-format="PNG" align="center" xml:id="setupSCSI-im1"></imagedata>
-</imageobject></mediaobject>
-
-  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX usually detects hard disks correctly. With some older SCSI controllers
-it may be unable to determine the correct drivers to use and subsequently
-fail to recognise the drive.</para>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell Drakx which SCSI drive(s)
-you have.</para>
+  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
+SCSI controllers it may be unable to determine the correct drivers to use
+and subsequently fail to recognise the drive.</para>
 
-  <para revision="3" xml:id="setupSCSI-pa3">DrakX should then be able to configure the drive(s) correctly.</para>
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
 </section>
diff --git a/docs/docs/stable/installer/hr/software.xml b/docs/docs/stable/installer/hr/software.xml
new file mode 100644
index 00000000..b796b052
--- /dev/null
+++ b/docs/docs/stable/installer/hr/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="hr" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hr/soundConfig.xml b/docs/docs/stable/installer/hr/soundConfig.xml
index d56914fd..2e393d68 100644
--- a/docs/docs/stable/installer/hr/soundConfig.xml
+++ b/docs/docs/stable/installer/hr/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="hr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Konfiguracija zvuka</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if we have a default
-one.</para>
+  
 
-  <para>The default driver should work without problems. However, if after install
-you do encounter problems, then run <command>draksound</command> or start
-this tool via MCC (Mageia Control Center), by choosing the
-<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound
-Configuration</guilabel> at the top right of the screen.</para>
+  
 
-  <para>Then, in the draksound or "Sound Configuration" tool screen, click on
-<guibutton>Advanced</guibutton> and then on
-<guibutton>Troubleshooting</guibutton> to find very useful advice about how
-to solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Napredno</title>
     </info>
 
-    <para>Clicking <guibutton>Advanced</guibutton> in this screen, during install, is
-useful if there is no default driver and there are several drivers
-available, but you think the installer selected the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on
-<guibutton>Let me pick any driver</guibutton>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hr/takeOverHdConfirm.xml b/docs/docs/stable/installer/hr/takeOverHdConfirm.xml
index 44997be9..900e1abd 100644
--- a/docs/docs/stable/installer/hr/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/hr/takeOverHdConfirm.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hr" xml:id="takeOverHdConfirm">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Confirm hard disk to be formatted</title>
   </info>
@@ -7,7 +13,11 @@
   
 
   
+
   
+
+  
+
   
 
   
@@ -19,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition='live'> <imagedata
-fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
-fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <guibutton>Previous</guibutton> if you are not sure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <guibutton>Next</guibutton> if you are sure and want to erase every
-partition, every operating system and all data on that hard disk.</para>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/hr/testing.xml b/docs/docs/stable/installer/hr/testing.xml
index bdf017c3..164efe74 100644
--- a/docs/docs/stable/installer/hr/testing.xml
+++ b/docs/docs/stable/installer/hr/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testing Mageia as Live system</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Live mode</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>You get this screen if you selected "Boot Mageia". If not, you get the
-"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Testing hardware</title>
       </info>
 
-      <para>One of the Live mode goals is to test if the hardware is correctly managed
-by Mageia. You can check if all devices have a driver in the Hardware
-section of the Mageia Control Center. You can test the most current devices:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>graphical card: if you see the previous screen, it's already OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webcam:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>printer: configure it and print a test page</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
       </itemizedlist>
 
-      <para>If all is OK for you, you can process to the installation. If not, you can
-leave with the quit button.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>The configuration settings you made here are kept for the installation.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,15 +68,14 @@ leave with the quit button.</para>
         <title xml:id="testing3-ti1">Launch installation</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
-SSD drive, simply click on the icon "Install on Hard Disk". You will get
-this screen, and then the "<link
-linkend="doPartitionDisks">Partitioning</link> step" as for the direct
-installation.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/hr/uninstall-Mageia.xml b/docs/docs/stable/installer/hr/uninstall-Mageia.xml
index e0c7a3a2..d009b100 100644
--- a/docs/docs/stable/installer/hr/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/hr/uninstall-Mageia.xml
@@ -1,38 +1,48 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="hr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hr" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
   </info>
 
   
 
-  <section>
-    <title xml:id="uninstall-Mageia-ti2">Howto</title>
+  
 
-    <para>If Mageia didn't convince you or you can't install it correctly, in short
-you want get rid of it. That is your right and Mageia also gives you the
+  <para>If Mageia didn't convince you or you can't install it correctly - in short
+you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-    <para>After your data backup, reboot your installation Mageia DVD and select
-Rescue system, then, Restore Windows boot loader. At the next boot, you will
-only have Windows with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-    <para>To recover the space used by Mageia partitions on Windows, click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code> to access to the partition
-management. You will recognize the Mageia partition because they are labeled
-<guilabel>Unknown</guilabel>, and also by their size and place in the
-disk. Right click on each of these partitions and select
-<guibutton>Delete</guibutton>. The space will be freed.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-    <para>If you are using Windows XP, you can create a new partition and format it
-(FAT32 or NTFS). It will get a partition letter.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
-    <para>If you have Vista or 7, you have one more possibility, you can extend the
-existing partition that is at the left of the freed space.  There are other
-partitioning tools that can be used, such as gparted, available for both
-windows and linux. As always, when changing partitions, be very careful, and
-make sure all important things have been backed up.</para>
-  </section>
-</section>
\ No newline at end of file
+  <para>If you have Vista or 7, you have one more possibility, you can extend the
+existing partition that is at the left of the freed space. There are other
+partitioning tools that can be used, such as <emphasis
+role="bold">gparted</emphasis>, available for both Windows and Linux. As
+always, when changing partitions, be very careful to back up anything
+important to you.</para>
+</section>
diff --git a/docs/docs/stable/installer/hr/unused.xml b/docs/docs/stable/installer/hr/unused.xml
index d2d6b2e1..3c902797 100644
--- a/docs/docs/stable/installer/hr/unused.xml
+++ b/docs/docs/stable/installer/hr/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hr" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="hr">
   <info>
     <title xml:id="unused-ti1">Keep or delete unused material</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para>In this step, the installer looks for unused locales packages and unused
-hardware packages. Then it proposes you to delete them. It is a good idea to
-accept, except if you prepare an installation which has to run on different
-hardware.</para>
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
+
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>The next step is the copying of files on hard disk. This takes some
-minutes. At the end, you get a blank screen for some time, it's normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/hu/DrakLive-cover.xml b/docs/docs/stable/installer/hu/DrakLive-cover.xml
index 4cf00f54..59b1fcfa 100644
--- a/docs/docs/stable/installer/hu/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/hu/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="hu" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="hu" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Telepítés a LIVE médiumról</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>2015 Január</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Telepítés a LIVE médiumról</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageia Hivatalos dokumentáció</para>
+      <para role="tagline">Mageia Hivatalos dokumentáció</para>
+
       <mediaobject>
-<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
-            <para>A kézikönyvben szereplő szövegek és képernyőképek  a CC BY-SA 3.0 licenc
+<imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
+
+      <para>A kézikönyvben szereplő szövegek és képernyőképek  a CC BY-SA 3.0 licenc
 alatt érhetők el <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-            </para>
-            <para>Ez a kézikönyv a<link ns6:href="http://www.neodoc.biz"> NeoDoc</link> által
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ez a kézikönyv a<link ns6:href="http://www.neodoc.biz"> NeoDoc</link> által
 kifejlesztett <link ns6:href="http://www.calenco.com">Calenco CMS</link>
-segítségével készült.
-            </para>
-            <para>Az önkéntesek szabadidejükben írták. Kérjük, lépjen kapcsolatba a <link
+segítségével készült.</para>
+
+      <para>Az önkéntesek szabadidejükben írták. Kérjük, lépjen kapcsolatba a <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentációs
-csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para> 
+csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para>
     </cover>
   </info>
+
   <article>
     <title>Telepítés a LIVE médiumról</title>
-       <para><note>
-          <para>Senki nem fogja látni az összes olyan telepítő képernyőt, amely ebben a
+
+    <para><note>
+        <para>Senki nem fogja látni az összes olyan telepítő képernyőt, amely ebben a
 kézikönyvben látható. Mely képernyők láthatók, a hardvertől és a telepítés
 során végrehajtott döntéstől függ.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/hu/DrakLive.xml b/docs/docs/stable/installer/hu/DrakLive.xml
index df0ff1bf..0c428eac 100644
--- a/docs/docs/stable/installer/hu/DrakLive.xml
+++ b/docs/docs/stable/installer/hu/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="hu" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="hu" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Telepítés a LIVE médiumról</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Telepítés a LIVE médiumról</title>
 
     <cover>
       <para><note>
@@ -17,9 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 kifejlesztett <link ns6:href="http://www.calenco.com">Calenco CMS</link>
 segítségével készült.</para>
 
-      <para>Az önkéntesek szabadidejükben írták. Kérjük, lépjen kapcsolatba a <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentációs
-csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</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>
 
@@ -39,7 +54,12 @@ csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +69,18 @@ csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/hu/DrakX-cover.xml b/docs/docs/stable/installer/hu/DrakX-cover.xml
index a31a02e5..bfde3f7c 100644
--- a/docs/docs/stable/installer/hu/DrakX-cover.xml
+++ b/docs/docs/stable/installer/hu/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="hu" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="hu" xml:id="Quick-Startup"
+      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>Telepítés a DarkX használatával</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>2014 Február</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>2014 Február</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageia Hivatalos dokumentáció</para>
+      <para role="tagline">Mageia Hivatalos dokumentáció</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>A kézikönyvben szereplő szövegek és képernyőképek  a CC BY-SA 3.0 licenc
+
+      <para>A kézikönyvben szereplő szövegek és képernyőképek  a CC BY-SA 3.0 licenc
 alatt érhetők el <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Ez a kézikönyv a<link ns6:href="http://www.neodoc.biz"> NeoDoc</link> által
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ez a kézikönyv a<link ns6:href="http://www.neodoc.biz"> NeoDoc</link> által
 kifejlesztett <link ns6:href="http://www.calenco.com">Calenco CMS</link>
-segítségével készült.
-	    </para>
-            <para>Az önkéntesek szabadidejükben írták. Kérjük, lépjen kapcsolatba a <link
+segítségével készült.</para>
+
+      <para>Az önkéntesek szabadidejükben írták. Kérjük, lépjen kapcsolatba a <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentációs
-csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para> 
+csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Telepítés a DarkX használatával</title>
-       <para><note>
-          <para>Senki nem fogja látni az összes olyan telepítő képernyőt, amely ebben a
+
+    <para><note>
+        <para>Senki nem fogja látni az összes olyan telepítő képernyőt, amely ebben a
 kézikönyvben látható. Mely képernyők láthatók, a hardvertől és a telepítés
 során végrehajtott döntéstől függ.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ során végrehajtott döntéstől függ.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/hu/DrakX-inline.xml b/docs/docs/stable/installer/hu/DrakX-inline.xml
new file mode 100644
index 00000000..fb32039a
--- /dev/null
+++ b/docs/docs/stable/installer/hu/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="hu" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Telepítés a DarkX használatával</title>
+
+    <cover>
+      <para><note>
+          <para>Senki nem fogja látni az összes olyan telepítő képernyőt, amely ebben a
+kézikönyvben látható. Mely képernyők láthatók, a hardvertől és a telepítés
+során végrehajtott döntéstől függ.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">A kézikönyvben szereplő szövegek és képernyőképek  a CC BY-SA 3.0 licenc
+alatt érhetők el <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ez a kézikönyv a<link ns6:href="http://www.neodoc.biz"> NeoDoc</link> által
+kifejlesztett <link ns6:href="http://www.calenco.com">Calenco CMS</link>
+segítségével készült.</para>
+
+      <para>Az önkéntesek szabadidejükben írták. Kérjük, lépjen kapcsolatba a <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentációs
+csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/DrakX.xml b/docs/docs/stable/installer/hu/DrakX.xml
index df53696d..a99a8da0 100644
--- a/docs/docs/stable/installer/hu/DrakX.xml
+++ b/docs/docs/stable/installer/hu/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="hu" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="hu" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Telepítés a DarkX használatával</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Telepítés a DarkX használatával</title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ csapattal</link>, ha segíteni szeretné a kézikönyv javítását.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/hu/SelectAndUseISOs2.xml b/docs/docs/stable/installer/hu/SelectAndUseISOs2.xml
index 454cec6a..d0324d31 100644
--- a/docs/docs/stable/installer/hu/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/hu/SelectAndUseISOs2.xml
@@ -1,39 +1,74 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="hu" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">ISO kiválasztás és használat</title>
   </info>
   <section>
     <title>Bevezetés</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
-which image match your needs.</para>
-    <para>There is two families of media:</para>
+which image best suits your needs.</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: After booting the media, it will follow a process
-allowing to choose what to install and how to configure your target
-system. This give you the maximal flexibility for a customized installation,
-in particular to choose which Desktop Environment you will install.</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
       </listitem>
       <listitem>
-        <para>LIVE media: you can boot the media in a real Mageia system without
-installing it, to see what you will get after installation.  The
-installation process is simpler, but you get lesser choices.</para>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Details are given in the next sections.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Media</title>
     <section>
       <title>Definition</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support the ISO
-file is copied to.</para>
-      <para>You can find them <link
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
+      <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
     <section>
@@ -42,23 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the traditional installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
-            <para>They are able to make a clean install or an update from previous releases.</para>
+            <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 or 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Some tools are available in the Welcome screen: Rescue System, Memory Test,
-Hardware Detection Tool.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Each DVD contains many available desktop environments and languages.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>You'll be given the choice during the installation to add non free software.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -69,22 +106,20 @@ Hardware Detection Tool.</para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>Can be used to preview the distribution without installing it on a HDD, and
-optionally install Mageia on to your HDD.</para>
+            <para>Can be used to preview the Mageia operating system without having to install
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 or 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade from previous
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>They contain non free software.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -92,13 +127,13 @@ releases.</emphasis></para>
         <title>Élő Plasma DVD</title>
         <itemizedlist>
           <listitem>
-            <para>Plasma desktop environment only.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Csak 64 bites architektúra</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -106,13 +141,13 @@ releases.</emphasis></para>
         <title>Élő GNOME DVD</title>
         <itemizedlist>
           <listitem>
-            <para>Csak GNOME ablakkezelő.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Csak 64 bites architektúra</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -120,39 +155,27 @@ releases.</emphasis></para>
         <title>Élő Xfce DVD</title>
         <itemizedlist>
           <listitem>
-            <para>Csak Xfce ablakkezelő.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 vagy 64 bites architektúrák.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
     </section>
     <section>
-      <title>Boot-only CD media</title>
+      <title>Net install media</title>
       <section>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>Each one is a small image that contains no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient when
-bandwidth is too low to download a full DVD, a PC without a DVD drive or a
-PC that can't boot from a USB stick.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 or 64 bit architectures.</para>
-          </listitem>
-          <listitem>
-            <para>Csak Angol nyelv.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -160,8 +183,8 @@ PC that can't boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -169,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains non-free software (mostly drivers, codecs...) for people who need
-it.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -181,62 +203,88 @@ it.</para>
     <section>
       <title>Letöltés</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
-BitTorrent. In both cases, a window gives you some information, such as the
-mirror in use and an opportunity to change if the bandwidth is to low. If
-http is chosen, you may also see something like</para>
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
-them. Keep one of them <link linkend="integrity">for further
-usage</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Check the radio button Save File.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
-      <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
-file to be downloaded. When you ask these algorithms to recalculate this
-number from your downloaded file, either you have the same number and your
-downloaded file is correct, or the number is different and you have a
-failure. A failure infers that you should retry the download or attempt a
-repair using BitTorrent.</para>
-      <para>Open a console, no need to be root, and:</para>
-      <para>- To use md5sum, type: [sam@localhost]$ <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
-      <para>- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum
-path/to/the/image/file.iso</userinput>.</para>
-      <para>and compare the obtained number on your computer (you may have to wait for a
-while) with the number given by Mageia. Example:</para>
+      <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
+      <para>To generate the checksum for your downloaded ISO, open a console, (no need
+to be root), and:</para>
+      <itemizedlist>
+        <listitem>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+        <listitem>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+      </itemizedlist>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para/>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Burn or dump the ISO</title>
-    <para>The checked ISO can now be burned to a CD or DVD or dumped to a USB
-stick. These operations are not a simple copy and aim to make a bootable
-medium.</para>
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
     <section>
       <title>Burning the ISO to a CD/DVD</title>
-      <para>Use whatever burner you wish but ensure the burning device is set correctly
-to <emphasis role="bold">burn an image</emphasis>, burn data or files is not
-correct. There is more information in <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
-wiki</link>.</para>
+wiki</link> for more information.</para>
     </section>
     <section>
       <title>Dump the ISO to a USB stick</title>
-      <para>All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick
-and then use it to boot and install the system.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any other data will be lost and the partition capacity will be
-reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>To recover the original capacity, you must redo partitioning and re-format
-the USB stick.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Using a graphical tool within Mageia</title>
         <para>You can use a graphical tool like <link
@@ -245,40 +293,51 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
       <section>
         <title>Using a graphical tool within Windows</title>
         <para>You could try:</para>
-        <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
-        <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
+        <itemizedlist>
+          <listitem>
+            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
+          </listitem>
+          <listitem>
+            <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
+Imager</link></para>
+          </listitem>
+        </itemizedlist>
       </section>
       <section>
-        <title>Using Command line within a GNU/Linux system</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
-          <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
-disc partition if you get the device-ID wrong.</para>
+          <para>It is potentially *dangerous* to do this by hand. You risk overwriting
+potentially valuable existing data if you specify the wrong target device.</para>
         </warning>
-        <para>You can also use the dd tool in a console:</para>
         <orderedlist>
           <listitem>
             <para>Open a console</para>
           </listitem>
           <listitem>
-            <para>Become root with the command <userinput>su -</userinput> (don't forget the
-final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Plug in your USB stick (do not mount it, this also means do not open any
-application or file manager that could access or read it)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Enter the command <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
-            <para>Alternatively, you can get the device name with the command
-<code>dmesg</code>: at end, you see the device name starting with
-<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
-            <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
+          </listitem>
+          <listitem>
+            <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+            <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
+            <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
 [72594.770536] usb 1-1: Product: Mass Storage Device
@@ -295,24 +354,28 @@ application or file manager that could access or read it)</para>
 [72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
 [72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
 [72595.967251]  <emphasis>sdd</emphasis>: sdd1
-[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
-          </listitem>
-          <listitem>
-            <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX
-bs=1M</userinput></para>
-            <para>Where X=your device name eg: /dev/sdc</para>
-            <para>Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
-of=/dev/sdb bs=1M</userinput></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
+            <tip>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
+            </tip>
           </listitem>
           <listitem>
-            <para>Enter the command: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
-            <para>Unplug your USB stick, it is done</para>
+            <para>This is the end of the process, and you may now unplug your USB stick.</para>
           </listitem>
         </orderedlist>
       </section>
diff --git a/docs/docs/stable/installer/hu/acceptLicense.xml b/docs/docs/stable/installer/hu/acceptLicense.xml
index 922138c4..69994b61 100644
--- a/docs/docs/stable/installer/hu/acceptLicense.xml
+++ b/docs/docs/stable/installer/hu/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,32 +37,44 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Licenc és kiadási megjegyzések</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
-revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
-</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
-revision="5" align="center" condition="live" format="PNG"
-fileref="live-license.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="acceptLicense-im1" fileref="dx2-license.png" align="center"
+revision="4"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-license.png" xml:id="acceptLicense-im2" revision="5"
+align="center" condition="live"/> </imageobject></mediaobject>
 
   <section xml:id="license">
     <info>
       <title xml:id="license-ti1">Licencmegállapodás</title>
     </info>
 
-    <para>Mielőtt telepítené a Mageiát kérjük olvassa el a licencfeltételeket.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>A feltételek a <application>Mageia</application> rendszerre vonatkoznak
-folytatás előtt kattintson az alkalmaz gombra.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Az elfogadáshoz válassza az <guilabel>elfogadom</guilabel> lehetőséget és
-kattintson a <guibutton>tovább</guibutton> gombra. </para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Ha még is úgy dönt, hogy ezeket a feltételeket nem fogadja el  akkor
-kattintson a <guibutton>kilépés</guibutton> gombra és a számítógép
-újraindul.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -74,7 +92,7 @@ Release Notes</para>
 
     
 
-    <para>A <application>Mageiáról</application> Fontos információk érhetők el ha
-rákattint a <guibutton>megjegyzések</guibutton> gombra.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/addUser.xml b/docs/docs/stable/installer/hu/addUser.xml
index fac49bf5..4a38add0 100644
--- a/docs/docs/stable/installer/hu/addUser.xml
+++ b/docs/docs/stable/installer/hu/addUser.xml
@@ -1,109 +1,134 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="hu" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Felhasználó és rendszergazda útmutató.</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
+
   
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">A rendszergazdai (root) jelszó beállítása</title>
     </info>
-    <para>Fontos, hogy a <application>Mageiánkba</application>magasabb szintű
-felhasználó vagy egy rendszergazda legyen. A Mageiában telepítéskor
-<emphasis>root jelszót</emphasis> kell megadni. Root jelszót a Linuxnál
-rendszergazdai jelszónak nevezik. A root jelszó beírásakor a pajzs szine
-piros, sárga és zöld  színüre változik ez a jelszó erősségétől függ. A zöld
-pajsz azt jelenti, hogy a jelszó erős. Ezt a jelszót mégegyszer be kell írni
-az alsó mezőbe azért, hogy biztossan nem tévesztettünk el egy karaktert se.</para>
+
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
+
     <note xml:id="givePassword">
-      <para>Minden jelszónál megkülönbözteti a kis és nagybetűket, a legjobb, ha a
-betűk (kis- és nagybetűk), számok és egyéb karakterek keverednek a
-jelszóban.</para>
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
+
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Adjon meg egy felhasználót</title>
     </info>
-    <para>Adjon hozzá egy felhasználót itt. A felhasználó kevesebb joggal rendelkezik,
-mint a rendszergazdai  felhasználó (root), de elég ahhoz, hogy az
-internetet, irodai alkalmazásokat vagy játékokat használjon, és bármi mást,
-amit az átlagos felhasználó a számítógépével használ</para>
+
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
+
     <itemizedlist>
       <listitem>
-        <para><guibutton>Ikon</guibutton>: Ha erre a gombra kattint akkor a felhasználók
-ikonja megváltozik.</para>
+        <para><emphasis role="bold">Icon</emphasis></para>
+
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Igazi Név</guilabel>: Adja meg a felhasználó igazi nevét.</para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Bejelentkezési név</guilabel>: Itt adja meg a felhasználói
-bejelentkezési nevet, vagy hagyja, hogy a drakx használja a felhasználó
-valódi nevének verzióját. <emphasis>A bejelentkezési név kis- és nagybetűkre
-érzékeny.</emphasis></para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Jelszó</guilabel>: Ebben a szövegmezőben írja be a felhasználói
-jelszót. A szöveg doboz végén van egy pajzs, amely jelzi a jelszó
-erejét. (Lásd még <xref linkend="givePassword"/>)</para>
-      </listitem>
-      <listitem>
-        <para><guilabel>Jelszó (újra)</guilabel>: Írja be újra a felhasználói jelszót erre
-a szövegmezőbe, és a drakx ellenőrzi, hogy ugyanaz a jelszó van-e a
-felhasználói jelszó szövegdobozaiban.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
+
     <note>
-      <para>Bármely felhasználó, akinek a Mageia telepítése közben hozzá van rendelve,
-rendelkezni fog olvasási és írási védett könyvtárral (umask = 0027).</para>
-      <para>Minden szükséges extra felhasználót hozzáadhat a <emphasis> Konfiguráció -
-Összegzés </emphasis> lépéshez a telepítés során. Válassza a <emphasis>
-Felhasználó kezelés </emphasis> lehetőséget.</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
+
+      <para>You can add any extra needed users in the <emphasis>Configuration -
+Summary</emphasis> step during the install. Choose <emphasis>User
+management</emphasis>.</para>
+
       <para>A hozzáférési jogosultságok a telepítés után is módosíthatók.</para>
     </note>
   </section>
-  <section xml:id="addUserAdvanced" condition="classical">
+
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Speciális Felhasználókezelés</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
-    <para>Ha a <guibutton>haladó</guibutton> gombra rákattintva megjelenik egy
-képernyő, amely lehetővé teszi a hozzáadni kívánt felhasználó beállításainak
-módosítását</para>
-    <para condition="classical">Ezenkívül letilthatja vagy engedélyezheti a vendégfiókot.</para>
-    <warning condition="classical">
-      <para>Bármit, amire a vendég az alapértelmezett <emphasis> rbash </emphasis>
-vendégfiókkal elmentheti a saját könyvtárát, és akkor törlődik, amikor ki
-jelentkezik. A vendégnek  a fontos fájlokat  le kell mentenie egy USB-s
-kulcsra.</para>
-    </warning>
+
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
+
     <itemizedlist>
-      <listitem condition="classical">
-        <para><guilabel> Vendégfiók engedélyezése </guilabel>: Itt engedélyezheti vagy
-letilthatja a vendégfiókot.A vendégfióknak köszönhetően a vendég
-bejelentkezhet és használhatja a számítógépet, de korlátozottabb
-hozzáféréssel rendelkezik, mint a normál felhasználók.</para>
-      </listitem>
       <listitem>
-        <para><guilabel>Parancssor </guilabel>: Ez a legördülő lista lehetővé teszi az
-előző képernyőhöz hozzáadott felhasználó által használt héj módosítását, a
-Bash, Dash és Sh</para>
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Felhasználó azonosító</guilabel>:Itt állíthatja be a felhasználói
-azonosítót a felhasználót hozzá adva, hogy  vissza térjen az előző
-képernyőre.Ez egy szám. Hagyja üresen, hacsak nem tudja, mit csinál.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Csoport azonosító</guilabel>:Ezzel beállíthatja a csoport
-azonosítóját.Szintén egy szám, általában ugyanaz, mint a felhasználó
-száma.Hagyja üresen, hacsak nem tudja, mit csinál.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hu/add_supplemental_media.xml b/docs/docs/stable/installer/hu/add_supplemental_media.xml
index eefe89da..d930ec60 100644
--- a/docs/docs/stable/installer/hu/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/hu/add_supplemental_media.xml
@@ -1,54 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hu" xml:id="add_supplemental_media"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="hu">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Média kiválasztás (Kiegészítő media csomagok telepítése és konfigurálása)</title>
-    </info>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
+  </info>
 
   
+
+  
+
+  
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
-<imageobject> <imagedata align="center"
-fileref="dx2-add_supplemental_media.png" format="PNG" revision="1"
-xml:id="dx2-add_supplemental_media-im1"/> </imageobject></mediaobject>
-
-  <para>Ez az ablak megjeleníti a mostani szoftvercomagokat mutatja. Ha hozzá kíván
-adni szoftvercsomagokat más forrásból akkor megteheti lemezről vagy más
-egyébb forrásból. A forrás kiválasztása határozza meg, hogy későbbiekben
-milyen csomagok állnak a rendelkezésére.</para>
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
+<imageobject> <imagedata format="PNG"
+fileref="dx2-add_supplemental_media.png"
+xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Hálózati forrás esetén két lépésre lesz szükség.</para>
 
   <orderedlist>
     <listitem>
-      <para>Először is a hálózati kapcsolat kiválasztása és aktiválása. </para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
-      <para>Válasszuk ki a nekünk megfelelő tükört vagy a kívánt URL -t (első
-bejegyzésként).  A tükör kiválasztásásval hozzáférhet a Mageia összes
-csomagjához és forrásához. Ilyen forrás lehet a nonfree és egyébb más
-források. Egy URL címmel kiválaszthatunk egy adott szofver forrást vagy
-saját NFS -t telepíthetünk.</para>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
-    <note>
-      <para>Ha frissít egy 64 bites csomagot akkor a frissítés tartalmazhat 32 bites
-csomagokat is. Ezért javasoljuk, hogy online tükörhozzá adásával frissítsen,
-Itt választhat a hálózati protokolok közül. A 64 bites DVD ISO -val csak 64
-bites és noarch csomagokat tudd frissíteni. De a kiválasztott internetes
-tükörrel 32 bites csomagokat is tudd telepíteni,</para>
-     </note>
-
-</section>
+  <note>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/ask_mntpoint_s.xml b/docs/docs/stable/installer/hu/ask_mntpoint_s.xml
index d6694374..f19ad3cd 100644
--- a/docs/docs/stable/installer/hu/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/hu/ask_mntpoint_s.xml
@@ -1,27 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="ask_mntpoint_s" version="5.0" xml:lang="hu">
-
+<section version="5.0" xml:lang="hu" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Válassza ki a csatolási pontokat</title>
   </info>
 
   
+
+  
+
+  
+
   
+
   
+
   
+
   
+
   
+
   
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -33,56 +44,55 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
-xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-chooseMountpoints.png" align="center" format="PNG"
-xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
-
-  <para>Itt láthatja a számítógépen talált Linux partíciókat.Ha nem ért egyet a
-<application>DrakX</application>  javaslataival, megváltoztathatja a
-csatolási pontokat.</para>
-
-  <note>
-    <para>If you change anything, make sure you still have a <literal>/</literal>
-(root) partition.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
 
-  <itemizedlist>
-    <listitem>
-      <para>Every partition is shown as follows: "Device" ("Capacity", "Mount point",
-"Type").</para>
-    </listitem>
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
+  <itemizedlist>
     <listitem>
-      <para>Az "eszköz" a következőket tartalmazza: ["merevlemez", "merevlemez-szám"
-(betű)], "partíciószám" (például "sda5").</para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
-    
     <listitem>
-      <para>If you have many partitions, you can choose many different mount points from
-the drop down menu, such as <literal>/</literal>, <literal>/home</literal>
-and <literal>/var</literal>. You can even make your own mount points, for
-instance <literal>/video</literal> for a partition where you want to store
-your films, or <literal>/cauldron-home</literal> for the
-<literal>/home</literal> partition of a cauldron install.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
-      <para>A partíciókhoz, amelyekhez nem kell hozzáférnie, a csatolási pont mezőt
-üresen hagyhatja.</para>
+      <para>For any partitions that you don't need to make use of, you can leave the
+mount point field blank.</para>
     </listitem>
   </itemizedlist>
 
   <warning>
-    <para>Choose <guibutton>Previous</guibutton> if you are not sure what to choose,
-and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen
-that follows, you can click on a partition to see its type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
   <para>If you are sure the mount points are correct, click on
-<guibutton>Next</guibutton>, and choose whether you only want to format the
-partition(s) DrakX suggests, or more.</para>
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
 </section>
diff --git a/docs/docs/stable/installer/hu/bestTime.xml b/docs/docs/stable/installer/hu/bestTime.xml
index 5d875b7e..48233d76 100644
--- a/docs/docs/stable/installer/hu/bestTime.xml
+++ b/docs/docs/stable/installer/hu/bestTime.xml
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hu" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="hu" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Az óra beállítása</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>Ebben a lépésben be kell állítania, hogy a belső óra milyen időpontban
-legyen, akár helyi idő, akár UTC idő.</para>
-
-  <para>A Speciális lapon további lehetőségek találhatók az órabeállításokkal
-kapcsolatban.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/bootLive.xml b/docs/docs/stable/installer/hu/bootLive.xml
index 71a66b40..c21b65f7 100644
--- a/docs/docs/stable/installer/hu/bootLive.xml
+++ b/docs/docs/stable/installer/hu/bootLive.xml
@@ -1,29 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="hu"><info><title xml:id="bootLive-ti1">Mageia indítása mint Live rendszer</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Betöltés az adathordozóról</title></info><section><info><title xml:id="bootLive11-ti1">Betöltés lemezről</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
-DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
-bootloader to launch the installation automatically after rebooting the
-computer. If that does not happen you may need to reconfigure your BIOS or
-press one key that will offer you to choose the peripheral from which the
-computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">Betöltés USB eszközről</title></info><para>You can boot from the USB device on which you dumped your image
-ISO. According to your BIOS settings, the computer boots perhaps directly on
-the USB device already plugged in a port. If that does not happen you may
-need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">BIOS/CSM/Legacy módban</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Az első képernyő a BIOS módban történő indítás során</para></caption></mediaobject><para>A középső menüben három művelet közül választhat:</para><itemizedlist><listitem><para>Boot Mageia: Ez azt jelenti, hogy a Mageia 5 a csatlakoztatott
-adathordozóról (CD / DVD vagy Pendriverról) elindul anélkül, hogy bármit
-írna a lemezre, ezért nagyon lassú rendszerre számíthat. A rendszerindítás
-után a merevlemezre telepíthető.</para></listitem><listitem><para>Mageia telepítése: Közvetlenül telepíti a Mageia rendszert a merevlemezre.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
-when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para></listitem></itemizedlist><para>Az alsó menü a Boot lehetőségek</para><itemizedlist><listitem><para>F1 - Segítés. Magyarázat a lehetőségekhez "splash", "apm", "acpi" és "Ide"</para></listitem><listitem><para>F2 - Nyelvek. Válasszon megjelenítési nyelvet.</para></listitem><listitem><para>F3 - Képernyő felbontás. Válasszon a szöveges, 640x400, 800x600, 1024x728
-megjelenítések között.</para></listitem><listitem><para>F4 - CD-Rom vagy Más. Általában a telepítés a behelyezett telepítő médiumról
-hajtódík végbe. Itt ki lehet választani más forrásokat is, mint FTP vagy NFS
-szerver. Ha a telepítést SLP szerverrel rendelkező hálózaton végzik,
-válasszon egyet a kiszolgálón elérhető telepítési forrásokból.</para></listitem><listitem><para>F5 - Illesztőprogram. Igen vagy Nem. A rendszer tisztában van egy opcionális
-lemez jelenlétével az illesztőprogram frissítésével, és a telepítés során be
-kell helyezni.</para></listitem><listitem><para>F6 - Kernel beállítások. Ez a lehetőség a hardver és a használni kívánt
-illesztőprogramok opcióinak megadása.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">UEFI módal</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Az első képernyő az UEFI rendszerről történő indításkor a lemezről</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice)  or to
-process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
-duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para><para>In each case, the first steps will be the same to choose language, timezone
-and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Mageia indítása mint Live rendszer</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Betöltés az adathordozóról</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">BIOS/CSM/Legacy módban</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Az első képernyő a BIOS módban történő indítás során</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">UEFI módal</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/hu/chooseDesktop.xml b/docs/docs/stable/installer/hu/chooseDesktop.xml
index db44e34c..ee53d1d3 100644
--- a/docs/docs/stable/installer/hu/chooseDesktop.xml
+++ b/docs/docs/stable/installer/hu/chooseDesktop.xml
@@ -1,27 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Munkaasztal kiválasztása</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Munkaasztal kiválasztása</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to fine
-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application> or
-<application>Gnome</application> desktop environment. Both come with a full
-set of useful applications and tools. Tick <guilabel>Custom</guilabel> if
-you want to use neither or both, or if you want something other than the
-default software choices for these desktop environments. The
-<application>LXDE</application> desktop is lighter than the previous two,
-sporting less eye candy and fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/hu/choosePackageGroups.xml b/docs/docs/stable/installer/hu/choosePackageGroups.xml
index dff30889..3527dfd5 100644
--- a/docs/docs/stable/installer/hu/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/hu/choosePackageGroups.xml
@@ -1,39 +1,42 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Csomagcsoportok kiválasztása</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
-  <para>Packages have been sorted into groups, to make choosing what you need on
+  <para>Packages are arranged into common groups, to make choosing what you need on
 your system a lot easier. The groups are fairly self explanatory, however
 more information about the content of each is available in tool-tips which
 become visible as the mouse is hovered over them.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Munkaállomás.</para>
+      <para><emphasis role="bold">Workstation</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Kiszolgáló.</para>
+      <para><emphasis role="bold">Server</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Grafikus környezet</para>
+      <para><emphasis role="bold">Graphical Environment</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Egyedi csomag választás: kézzel kiválaszthatja a telepítendő vagy
-eltávolítandó csomagokat.</para>
+      <para><emphasis role="bold">Individual Package Selection</emphasis>: you can use
+this option to manually add or remove packages</para>
     </listitem>
   </itemizedlist>
 
-  <para>Read <xref linkend="minimal-install"/> for instructions on how to do a
+  <para>See <xref linkend="minimal-install"/> for instructions on how to do a
 minimal install (without or with X &amp; IceWM).</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/choosePackagesTree.xml b/docs/docs/stable/installer/hu/choosePackagesTree.xml
index dd8cf2bc..0f26bb81 100644
--- a/docs/docs/stable/installer/hu/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/hu/choosePackagesTree.xml
@@ -1,23 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="choosePackagesTree">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="hu">
+  <info>
+    <title xml:id="choosePackagesTree-ti1">Válasszon ki egy egyedi csomagot</title>
+  </info>
 
-    <info>
-      <title xml:id="choosePackagesTree-ti1">Válasszon ki egy egyedi csomagot</title>
-    </info>
+  
 
-    
+  
 
-<mediaobject>
+  
+
+  <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
-<imageobject> <imagedata fileref="dx2-choosePackagesTree.png" align="center"
-format="PNG" ></imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
+align="center"/> </imageobject></mediaobject>
 
-    <para>Here you can add or remove any extra packages to customise your
+  <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-    <para>After having made your choice, you can click on the <guibutton>floppy
-icon</guibutton> at the bottom of the page to save your choice of packages
-(saving to a USB key works, too). You can then use this file to install the
-same packages on another system, by pressing the same button during install
-and choosing to load it.</para>
-  </section>
-
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/configureServices.xml b/docs/docs/stable/installer/hu/configureServices.xml
index 714c7ca8..69633e68 100644
--- a/docs/docs/stable/installer/hu/configureServices.xml
+++ b/docs/docs/stable/installer/hu/configureServices.xml
@@ -1,40 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="configureServices" version="5.0" xml:lang="hu">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="hu" xml:id="configureServices">
+  <info>
+    <title xml:id="configureServices-ti1">Szolgáltatások beállítása</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="configureServices-ti1">Szolgáltatások beállítása</title>
-    </info>
+  
 
-    
-   
+  
 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureServices.png"
-align="center" format="PNG" xml:id="configureServices-im1"></imagedata>
-</imageobject></mediaobject>
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
+xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
+  <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-    <para revision="1" xml:id="configureServices-pa1">Here you can set which services should (not) start when you boot your
-system.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-    <para revision="1" xml:id="configureServices-pa2">There are four groups, click on the triangle before a group to expand it and
-see all services in it.</para>
-
-    <para revision="1" xml:id="configureServices-pa3">The setting DrakX chose are usually good.</para>
-
-    <para revision="1" xml:id="configureServices-pa4">If you highlight a service, some information about it is shown in the info
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">If you highlight a service, some information about it is shown in the info
 box below.</para>
+    </listitem>
+  </itemizedlist>
 
-    <para revision="1" xml:id="configureServices-pa5">Only change things when you know very well what you are doing.</para>
-  </section>
-
+  <para xml:id="configureServices-pa5" revision="1">Only change things when you know very well what you are doing.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/configureTimezoneUTC.xml b/docs/docs/stable/installer/hu/configureTimezoneUTC.xml
index 04a9c8c0..08c107cf 100644
--- a/docs/docs/stable/installer/hu/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/hu/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="configureTimezoneUTC">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="hu">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Időzóna beállítása</title>
   </info>
@@ -7,20 +7,30 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject condition="classical"> <imagedata
-xml:id="configureTimezoneUTC-im1" revision="1"
-fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
-</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
-condition="live" format="PNG"/> </imageobject></mediaobject>
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="configureTimezoneUTC-im1" align="center"
+fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa1">Choose your time zone by choosing your country or a city close to you in the
-same time zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa2">In next screen you can choose to set your hardware clock to local time or to
-GMT, also known as UTC.</para>
+  <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
+or to GMT, also known as UTC.</para>
 
   <note>
     <para revision="1" xml:id="configureTimezoneUTC-pa3">If you have more than one operating system on your computer, make sure they
diff --git a/docs/docs/stable/installer/hu/configureX_card_list.xml b/docs/docs/stable/installer/hu/configureX_card_list.xml
index 4e657c32..6d4ecf3d 100644
--- a/docs/docs/stable/installer/hu/configureX_card_list.xml
+++ b/docs/docs/stable/installer/hu/configureX_card_list.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="configureX_card_list">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
@@ -6,20 +13,28 @@
   
 
   
+
+  
+
+  
+
   
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-xml:id="configureX_card_list-im1" fileref="dx2-configureX_card_list.png"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX has a very comprehensive database of video cards and will usually
 correctly identify your video device.</para>
@@ -27,33 +42,34 @@ correctly identify your video device.</para>
   <para>If the installer has not correctly detected your graphic card and you know
 which one you have, you can select it from the tree by: <itemizedlist>
       <listitem>
-        <para>gyártó</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>then the name of your card</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>és a kártya típusa</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-Xorg category</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>The Xorg listing provides more than 40 generic and open source video card
-drivers. If you still can't find a named driver for your card there is the
-option of using the vesa driver which provides basic capabilities.</para>
-
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the Commandline Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the Nonfree repository and in some cases only from
-the card manufacturers' websites.</para>
-
-  <para>The Nonfree repository needs to be explicitly enabled to access them.  If
-you didn't select it previously, you should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/hu/configureX_chooser.xml b/docs/docs/stable/installer/hu/configureX_chooser.xml
index c702380f..4a71407d 100644
--- a/docs/docs/stable/installer/hu/configureX_chooser.xml
+++ b/docs/docs/stable/installer/hu/configureX_chooser.xml
@@ -1,64 +1,92 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="hu">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Videó-kártya és Monitor beállítások</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata revision="1" fileref="dx2-configureX_chooser.png"
-align="center" format="PNG" xml:id="configureX_chooser-im1"> </imagedata>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or
-any other graphical environment to work well, the following
-<acronym>X</acronym> settings need to be correct. Choose the correct
-settings if you can see that <application>DrakX</application> didn't make a
-choice, or if you think the choice is incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis><guibutton>Videókártya</guibutton></emphasis>: Ha szükséges,
-válassza ki a kártyát a listából.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor
-from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel>
-list. Choose <guilabel>Custom</guilabel> if you prefer to manually set the
-horizontal and vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para revision="1" xml:id="configureX_chooser-pa3a">Incorrect refresh rates may damage your monitor</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired
-resolution and color depth of your monitor here.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the button is there, you can control your
-settings by pressing it. If you see a question asking you whether your
-settings are correct, you can answer "yes", and the settings will be
-kept. If you don't see anything, you'll return to the configuration screen
-and be able to reconfigure everything until the test is good. <emphasis>Make
-sure your settings are on the safe side if the test button isn't
-available</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to
-enable or disable various options.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
 </section>
diff --git a/docs/docs/stable/installer/hu/configureX_monitor.xml b/docs/docs/stable/installer/hu/configureX_monitor.xml
index 3e6c9286..b4a9f398 100644
--- a/docs/docs/stable/installer/hu/configureX_monitor.xml
+++ b/docs/docs/stable/installer/hu/configureX_monitor.xml
@@ -14,11 +14,17 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
-<!-- lproof -->
+<!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Monitor kiválasztása</title>
   </info>
 
@@ -26,58 +32,73 @@
 correctly identify yours.</para>
 
   <warning>
-    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis>Selecting a monitor with different characteristics could damage
-your monitor or video hardware. Please don't try something without knowing
-what you are doing.</emphasis> If in doubt you should consult your monitor
-documentation</para>
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
+could damage your monitor or video hardware. Please don't try something
+without knowing what you are doing.</emphasis> If in doubt you should
+consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
 format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa2"><emphasis>Egyéni</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters, the vertical refresh
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
 rate and the horizontal sync rate. Vertical refresh determines how often the
 screen is refreshed and horizontal sync is the rate at which scan lines are
 displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
+        <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
 type with a sync range that is beyond the capabilities of your monitor: you
 may damage your monitor. If in doubt, choose a conservative setting and
 consult your monitor documentation.</para>
+      </listitem>
+    </varlistentry>
 
-  <para revision="1" xml:id="configureX_monitor-pa5"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and tries to determine the monitor type from the
-monitor database.</para>
-
-  <para revision="1"
-  xml:id="configureX_monitor-pa7"><emphasis>Gyártó</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
-one you have, you can select it from the tree by selecting: <itemizedlist>
       <listitem>
-        <para>gyártó</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>a monitor gyártó neve</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>a monitor leírása</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can select it from the tree by selecting:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa9"><emphasis>Általános</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para revision="1" xml:id="configureX_monitor-pa10">selecting this group displays nearly 30 display configurations such as
-1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the Vesa card driver
-when your video hardware cannot be determined automatically. Once again it
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
 may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 </section>
diff --git a/docs/docs/stable/installer/hu/diskPartitioning.xml b/docs/docs/stable/installer/hu/diskPartitioning.xml
new file mode 100644
index 00000000..62016ae3
--- /dev/null
+++ b/docs/docs/stable/installer/hu/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="hu" version="5.0" xml:lang="hu">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/diskdrake.xml b/docs/docs/stable/installer/hu/diskdrake.xml
index 365ffa67..042c8afd 100644
--- a/docs/docs/stable/installer/hu/diskdrake.xml
+++ b/docs/docs/stable/installer/hu/diskdrake.xml
@@ -1,49 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" 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" version="5.0" xml:lang="hu" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Egyedi lemezparticionálás a DiskDrake segítségével</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
+
   <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <literal>/</literal> partition you
-must ensure that you have a separate <literal>/boot</literal> partition. The
-encryption option for the <literal>/boot</literal> partition must NOT be
-set, otherwise your system will be unbootable.</para>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
   </warning>
-  <para xml:id="diskdrake-pa3" revision="2">Adjust the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view what is in them before you start.</para>
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab for every detected hard disk or other storage device, like an
-USB key. For example sda, sdb and sdc if there are three of them. </para>
-  <para xml:id="diskdrake-pa5" revision="1">Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected
-storage device</para>
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert
-mode</guibutton>) gives some more tools like to add a label or to choose a
-partition type. </para>
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you adjusted everything to your wishes.</para>
-  <para xml:id="diskdrake-pa7" revision="1">Click <guibutton>Done</guibutton> when you're ready.</para>
-  <note>
-    <para>If you are installing Mageia on an UEFI system, check that an ESP (EFI
-System Partition) is present and correctly mounted on /boot/EFI (see below)</para>
-    <para><mediaobject><imageobject condition="classical"><imagedata fileref="dx2-diskdrake2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-align="center" fileref="live-diskdrake2.png"/></imageobject></mediaobject></para>
-  </note>
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
-    <mediaobject>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
+
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
+
+  <figure>
+    <title>EFI System Partition</title>
+
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
+
+  <figure>
+    <title>BIOS boot partition</title>
+
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/hu/doPartitionDisks.xml b/docs/docs/stable/installer/hu/doPartitionDisks.xml
index 15d41a13..01f1035d 100644
--- a/docs/docs/stable/installer/hu/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/hu/doPartitionDisks.xml
@@ -1,82 +1,214 @@
-<?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:lang="hu" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+
   
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
 
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Partícionálás</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) and see the
-solutions the DrakX partitioning wizard found for where to install
-<application>Mageia</application>.</para>
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from the list below will vary depending on your
-particular hard drive(s) layout and content.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist><listitem><para revision="1" xml:id="doPartitionDisks-pa4">Létező partíciók használata</para><para xml:id="doPartitionDisks-pa5" revision="1">If this option is available, then existing Linux compatible partitions have
-been found and may be used for the installation.</para></listitem><listitem><para xml:id="doPartitionDisks-pa6" revision="1">Szabad hely használata</para><para xml:id="doPartitionDisks-pa7" revision="1">If you have unused space on your hard drive then this option will use it for
-your new Mageia installation.</para></listitem><listitem><para xml:id="doPartitionDisks-pa8" revision="1">Szabad hely használata a Windows Partíción</para><para xml:id="doPartitionDisks-pa9" revision="1">If you have unused space on an existing Windows partition, the installer may
-offer to use it.</para><para xml:id="doPartitionDisks-pa10" revision="2">This can be a useful way of making room for your new Mageia installation,
-but is a risky operation so you should make sure you have backed up all
-important files!</para><para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa5">If this option is available, then existing Linux compatible partitions have
+been found and may be used for the installation.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa7">If you have unused space on your hard drive then this option will use it for
+your new Mageia installation.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
+
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
+
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
 partition must be "clean", meaning that Windows must have closed down
 correctly the last time it was used. It must also have been defragmented,
 although this is not a guarantee that all files in the partition have been
 moved out of the area that is about to be used. It is highly recommended to
-back up your personal files.</para><para>With this option, the installer displays the remaining Windows partition in
-light blue and the future Mageia partition in dark blue with their intended
-sizes just under. You have the possibility to adapt these sizes by clicking
-and dragging the gap between both partitions. See the screen-shot below.</para><mediaobject><imageobject condition="classical"><imagedata
-fileref="dx2-doPartitionDisks2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-fileref="live-doPartitionDisks2.png" align="center"/></imageobject></mediaobject></listitem></itemizedlist> <itemizedlist><listitem><para xml:id="doPartitionDisks-pa12" revision="1">Az egész lemez törlése és használata.</para><para xml:id="doPartitionDisks-pa13" revision="1">This option will use the complete drive for Mageia.</para><para xml:id="doPartitionDisks-pa14" revision="1">Note! This will erase ALL data on the selected hard drive. Take care!</para><para xml:id="doPartitionDisks-pa15" revision="1">If you intend to use part of the disk for something else, or you already
-have data on the drive that you are not prepared to lose, then do not use
-this option.</para></listitem></itemizedlist><itemizedlist><listitem><para xml:id="doPartitionDisks-pa16" revision="1">Egyéni lemezpartícionálás</para><para xml:id="doPartitionDisks-pa17" revision="1">This gives you complete control over the placing of the installation on your
-hard drive(s).</para></listitem></itemizedlist></para>
-  <para><emphasis role="bold">Partíció méret:</emphasis></para>
-  <para>The installer will share the available place out according to the following
-rules:</para>
-  <para><itemizedlist><listitem><para>If the total available place is lower than 50 GB, only one partition is
-created for /, there is no separate partition for /home.</para></listitem><listitem><para>If the total available place is over 50 GB, then three partitions are
-created</para><itemizedlist><listitem><para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para></listitem><listitem><para>1/19 is allocated to swap with a maximum of 4 GB</para></listitem><listitem><para>the rest (at least 12/19) is allocated to /home</para></listitem></itemizedlist></listitem></itemizedlist></para>
-  <para>That means that from 160 GB and over of available place, the installer will
-create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.</para>
+back up your personal files.</para>
+      </important>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa17">This gives you complete control over the placing of the installation on your
+hard drive(s).</para>
+    </listitem>
+  </itemizedlist>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
+
   <note>
-    <para>If you are using an UEFI system, the ESP (EFI System Partition) will be
-automatically detected, or created if it does not exist yet, and mounted on
-/boot/EFI. The "Custom disk partitioning" option is the only one that allows
-to check it has been correctly done</para>
+    <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
-  <note>
-    <para>If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk,
-you need to create a Bios boot partition if not already existing. It is an
-about 1 MiB partition with no mount point. Choose <xref
-linkend="diskdrake"/> to be able to create it with the Installer like any
-other partition, just select BIOS boot partition as filesystem type.</para>
-    <mediaobject>
+
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
-  <warning>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
+
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
-previous standard of 512 byte logical sectors. Due to lack of available
-hardware, the partitioning tool used in the installer has not been tested
-with such a drive. Also some ssd drives now use an erase block size over 1
-MB. We suggest to pre-partition the drive, using an alternative partitioning
-tool like gparted, if you own such a device, and to use the following
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
 settings:</para>
-    <para>"Align to" "MiB"</para>
-    <para>"Free space preceding (MiB)" "2"</para>
-    <para>Also make sure all partitions are created with an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Also make sure all partitions are created using an even number of megabytes.</para>
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/hu/exitInstall.xml b/docs/docs/stable/installer/hu/exitInstall.xml
index ced46109..155352d3 100644
--- a/docs/docs/stable/installer/hu/exitInstall.xml
+++ b/docs/docs/stable/installer/hu/exitInstall.xml
@@ -1,20 +1,32 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xml:id="exitInstall" version="5.0" xml:lang="hu">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0" xml:lang="hu">
   <info>
     <title xml:id="exitInstall-ti1">Gratulálunk</title>
   </info>
+
   
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
-  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring
-<application>Mageia</application> and it is now safe to remove the
-installation medium and reboot your computer.</para>
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems on your computer (if you have more than one).</para>
+
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
+
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
+
   <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the settings for the bootloader, your Mageia install
 will be automatically selected and started.</para>
+
   <para xml:id="exitInstall-pa4" revision="1">Enjoy!</para>
-  <para xml:id="exitInstall-pa5" revision="1">Visit www.mageia.org if you have any questions or want to contribute to
-Mageia</para>
+
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/firewall.xml b/docs/docs/stable/installer/hu/firewall.xml
index fe2953f6..cbe683c3 100644
--- a/docs/docs/stable/installer/hu/firewall.xml
+++ b/docs/docs/stable/installer/hu/firewall.xml
@@ -1,33 +1,37 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="hu">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="hu" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Tűzfal</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Tűzfal</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows to configure some simple firewall rules: they determine
-which type of message from the Internet will be accepted by the target
-system. This, in turn, allows the corresponding services on the system to be
-accessible from the Internet.</para>
+  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+determine which type of message from the Internet will be accepted by the
+target system. This, in turn, allows the corresponding services on the
+system to be accessible from the Internet.</para>
 
-  <para>In the default setting, no button is checked - no service of the system is
-accessibly from the network. The "<emphasis>Everything (no
-firewall)</emphasis>" button has a particular role: it enables access to all
-services of the machine - an option that does not make much sense in the
-context of the installer since it would create a totally unprotected
-system.  Its veritable use is in the context of the Mageia Control Center
-(which uses the same GUI layout) for temporarily disabling the entire set of
-firewall rules for testing and debugging purposes.</para>
+  <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
 
-  <para>All other checkbuttons are more or less self-explanatory. As an example, you
-will check the "CUPS server" button if you want printers on your machine to
-be accessible from the network.</para>
+  <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The set of checkbuttons only comprises the most common services. The
-"Advanced" button allows to enable messages that correspond to a service for
-which no checkbutton exists. The "<emphasis>Advanced</emphasis>" button
-opens a window where you can enable a series of services by typing a list of
-couples (blank separated)</para>
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
 
diff --git a/docs/docs/stable/installer/hu/formatPartitions.xml b/docs/docs/stable/installer/hu/formatPartitions.xml
index c6aa1d25..82106608 100644
--- a/docs/docs/stable/installer/hu/formatPartitions.xml
+++ b/docs/docs/stable/installer/hu/formatPartitions.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="formatPartitions">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formatting</title>
   </info>
@@ -7,40 +13,41 @@
   
 
   
+
   
+
   
+
   
-  
-  
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-formatPartitions.png" format="PNG" align="center"
-xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-formatPartitions.png" format="PNG" align="center"
-xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
-partitions <emphasis>not</emphasis> marked for formatting will be saved.</para>
+partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa2">Usually at least the partitions DrakX selected, need to be formatted</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa3">Click on <guibutton>Advanced</guibutton> to choose partitions you want to
-check for so called <emphasis>bad blocks</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
     <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen.
-In that screen you can choose to view what is in your partitions.</para>
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selection, click on
-<guibutton>Next</guibutton> to continue.</para>
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
 </section>
diff --git a/docs/docs/stable/installer/hu/graphicalConfiguration.xml b/docs/docs/stable/installer/hu/graphicalConfiguration.xml
new file mode 100644
index 00000000..1b50fde3
--- /dev/null
+++ b/docs/docs/stable/installer/hu/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/hu/installUpdates.xml b/docs/docs/stable/installer/hu/installUpdates.xml
index 8a58c0e3..7e8d7383 100644
--- a/docs/docs/stable/installer/hu/installUpdates.xml
+++ b/docs/docs/stable/installer/hu/installUpdates.xml
@@ -1,31 +1,46 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="hu">
+  
 
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="installUpdates"><info><title xml:id="installUpdates-ti1">Frissítések</title></info>
+  
 
+  
 
+  
 
+  
 
- 
- 
- 
+  
 
-   <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-installUpdates.png"
-format="PNG" align="center" xml:id="installUpdates-im1"></imagedata>
-</imageobject></mediaobject> 
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Frissítések</title>
+  </info>
 
- <para revision="1" xml:id="installUpdates-pa1">Since this version of <application>Mageia</application> was released, some
-packages will have been updated or improved.</para>
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
+align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="installUpdates-pa2">Choose <guilabel>yes</guilabel> if you wish to download and install them,
-select <guilabel>no</guilabel> if you don't want to do this now, or if you
-aren't connected to the Internet</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para revision="1" xml:id="installUpdates-pa3">Then press <guibutton>Next</guibutton> to continue</para>
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+    </listitem>
 
-</section>
-  
\ No newline at end of file
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/installer.xml b/docs/docs/stable/installer/hu/installer.xml
index a095eef3..2caf7a37 100644
--- a/docs/docs/stable/installer/hu/installer.xml
+++ b/docs/docs/stable/installer/hu/installer.xml
@@ -1,166 +1,169 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="installer">
-  <info>
-    <title xml:id="Select-and-use-ISOs-ti1">DrakX, a Mageia telepítő</title>
-  </info>
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="installer"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
 
-  <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
-Installer is designed to help make your installation or upgrade as easy as
-possible.</para>
-
-  <para>The initial menu screen has various options, however the default one will
-start the installer, which will normally be all that you will need.</para>
+  
 
-  <section>
-    <title>Installation Welcome Screen</title>
+  
 
-    <section>
-      <title>Using a Mageia DVD</title>
+  
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-with an UEFI system and the second one with a Legacy system:</para>
+  
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+  
 
-      <para>From this screen, you can access to options by pressing the "e" letter to
-enter the "edit mode". To come back to this screen, press either the key
-"esc" to quit without saving or press the key "Ctrl" or "F10" to quit with
-saving.</para>
+  
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
+  
 
-      <para>From this screen, it is possible to set some personal preferences:<itemizedlist>
-          <listitem>
-            <para>The language (for the installation only, may be different that the chosen
-language for the system) by pressing the key F2 (Legacy mode only)</para>
+  
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
+  
 
-            <para>Use the arrow keys to select the language and press the key Enter.</para>
+  <info>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, a Mageia telepítő</title>
+  </info>
 
-            <para>Here is for example, the French welcome screen when using a Live
-DVD/CD. Note that the Live DVD/CD menu does not propose: <guilabel>Rescue
-System</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware
-Detection Tool</guilabel>.</para>
+  <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
+Installer is designed to help make your installation or upgrade as easy as
+possible.</para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome4fr.png"/> </imageobject></mediaobject>
-          </listitem>
+  <section>
+    <title>Telepítési lépések</title>
 
-          <listitem>
-            <para>Change the screen resolution by pressing the F3 key (Legacy mode only).</para>
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
 
-          <listitem>
-            <para>Add some kernel options by pressing the <emphasis role="bold">F6</emphasis>
-key for the legacy mode or the <emphasis role="bold">e</emphasis> key for
-the UEFI mode.</para>
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
 
-            <para>If the installation fails, then it may be necessary to try again using one
-of the extra options. The menu called by F6 displays a new line called
-<guilabel>Boot options</guilabel> and propose four entries:</para>
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
-            <para>- Default, it doesn't alter anything in the default options.</para>
+  <section>
+    <title>Installation Welcome Screen</title>
 
-            <para>- Default, it doesn't alter anything in the default options.</para>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-            <para>- No ACPI (Advanced Configuration and Power Interface), power management
-isn't taken into account.</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
 
-            <para>- No Local APIC (Local Advanced Programmable Interrupt Controller), it is
-about CPU interruptions, select this option if you are asked for.</para>
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
-            <para>When you select one of these entries, it modifies the default options
-displayed in the <guilabel>Boot Options</guilabel> line.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with the
-key F6 does not appear in the <guilabel>Boot Options</guilabel> line,
-however, they are really taken into account.</para>
-            </note>
+      <itemizedlist>
+        <title>Menu</title>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
 
-          <listitem>
-            <para>Add more kernel options by pressing the key F1 (Legacy mode only).</para>
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
 
-            <para>Pressing F1 opens a new window with more available options.  Select one with
-the arrow keys and press Enter to have more details or press the Esc key to
-go back to the welcome screen.</para>
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
 
-            <para>The detailed view about the option splash. Press Esc or select
-<guilabel>Return to Boot Options</guilabel> to go back to the options
-list. These options can by added by hand in the <guilabel>Boot
-options</guilabel> line.</para>
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
 
-            <note>
-              <para>The help is translated in the chosen language with the F2 key.</para>
-            </note>
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
 
-            <para>For more information about kernel options on legacy and UEFI systems, see:
-<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
 
     <section>
-      <title>Vezetékes hálózat használata</title>
-
-      <para>Here is the default welcome screen when using a Wired Network-based
-Installation CD (netinstall.iso or netinstall-nonfree.iso images):</para>
+      <title>UEFI Systems</title>
 
-      <para>It does not allow to change the language, the available options are
-described in the screen. For more information about using a Wired
-Network-based Installation CD, see <link
-ns2:href="https://wiki.mageia.org/en/Boot.iso_install">the Mageia
-Wiki</link></para>
-
-      <warning>
-        <para>The keyboard layout is the American one.</para>
-      </warning>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
       <mediaobject>
-<imageobject> <imagedata fileref="../dx-help.png"/> </imageobject></mediaobject>
-    </section>
-  </section>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-  <section>
-    <title>Telepítési lépések</title>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <para>The install process is divided into a number of steps, which can be followed
-on the side panel of the screen.</para>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> buttons with extra, less commonly required,
-options.</para>
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons which give further
-explanations about the current step.</para>
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
 
-    <note>
-      <para>If somewhere during install you decide to stop the installation, it is
-possible to reboot, but please think twice before you do this.  Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -171,17 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>After the initial screen you did not reach the language selection
-screen. This can happen with some graphic cards and older systems. Try using
-low resolution by typing <code>vgalo</code> at the prompt.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this hit ESC at the first welcome screen and confirm with ENTER. You will be
-presented with a black screen with the word "boot:". Type "text" and hit
-ENTER. Now continue with the installation in text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -190,31 +196,30 @@ ENTER. Now continue with the installation in text mode.</para>
       <title>A telepítés lefagy</title>
 
       <para>If the system appeared to freeze during the installation, this may be a
-problem with hardware detection. In this case the automatic detection of
-hardware may be bypassed and dealt with later. To try this, type
-<code>noauto</code> at the prompt. This option may also be combined with
-other options as necessary.</para>
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
       <title>RAM hiba</title>
 
-      <para>These will rarely be needed, but in some cases the hardware may report the
+      <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dinamikus partíciók</title>
 
-      <para>If you converted your hard disk from "basic" format to "dynamic" format on
-Microsoft Windows, you must know that it is impossible to install Mageia on
-this disc. To go back to a basic disk, see the Microsoft documentation:
-<link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
-
-  <section/>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hu/locale.xml b/docs/docs/stable/installer/hu/locale.xml
new file mode 100644
index 00000000..f9d44a9e
--- /dev/null
+++ b/docs/docs/stable/installer/hu/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/hu/login.xml b/docs/docs/stable/installer/hu/login.xml
index d5da5c2e..7734e792 100644
--- a/docs/docs/stable/installer/hu/login.xml
+++ b/docs/docs/stable/installer/hu/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="hu"><info><title xml:id="label-to-adapt-ti1">Bejelentkező képernyő</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM bejelentkező képernyő</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
-yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para><para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="hu">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/media_selection.xml b/docs/docs/stable/installer/hu/media_selection.xml
index db0c1c26..686cf838 100644
--- a/docs/docs/stable/installer/hu/media_selection.xml
+++ b/docs/docs/stable/installer/hu/media_selection.xml
@@ -1,18 +1,31 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="hu">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Média kiválasztása (Zárt csomagok)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
+
   
+
   
+
   
 
-<mediaobject>
+  
+  
+  <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
 <imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
 format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
@@ -31,7 +44,7 @@ the base of the distribution.</para>
       <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
 free-of-charge, i.e. Mageia may redistribute them, but they contain
 closed-source software (hence the name - Nonfree). For example this
-repository includes nVidia and ATI graphics card proprietary drivers,
+repository includes nVidia and AMD graphics card proprietary drivers,
 firmware for various WiFi cards, etc.</para>
     </listitem>
 
@@ -39,8 +52,8 @@ firmware for various WiFi cards, etc.</para>
       <para>The <emphasis>Tainted</emphasis> repository includes packages released under
 a free license. The main criteria for placing packages in this repository is
 that they may infringe patents and copyright laws in some countries,
-e.g. Multimedia codecs needed to play various audio/video files; packages
-needed to play commercial video DVD, etc.</para>
+e.g. multimedia codecs needed to play various audio/video files; packages
+needed to play commercial video DVD's, etc.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hu/minimal-install.xml b/docs/docs/stable/installer/hu/minimal-install.xml
index e55a822f..4a8d0fcb 100644
--- a/docs/docs/stable/installer/hu/minimal-install.xml
+++ b/docs/docs/stable/installer/hu/minimal-install.xml
@@ -1,48 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hu" xml:id="minimal-install"
-         xmlns="http://docbook.org/ns/docbook"
-	 xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="hu">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Minimális telepítő</title>
   </info>
 
   
+
+  
+
+  
+
+  
+
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref
-linkend="choosePackageGroups"></xref>.</para>
-  <para>If desired, you can additionally tick the "Individual package selection"
-option in the same screen.</para>
   <para>Minimal Installation is intended for those with specific uses in mind for
-their <application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the "Individual
-package selection" option mentioned above, to fine-tune your installation,
-see <xref linkend="choosePackagesTree"></xref>.</para>
-  <para>If you choose this installation class, then the related screen will offer
-you a few useful extras to install, such as documentation and X.</para>
-  <para>If selected, "With X" will also include IceWM as lightweight desktop
-environment.</para>
-  <para>The basic documentation is provided in the form of man and info pages.  It
-contains the man pages from the <link
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
 Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
 coreutils</link> info pages.</para>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" fileref="dx2-minimal-install.png"
-align="center" format="PNG" xml:id="minimal-install-im1"></imagedata>
+<imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
+align="center" fileref="dx2-minimal-install.png" revision="1"/>
 </imageobject></mediaobject>
-
-  </section>
-
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/misc-params.xml b/docs/docs/stable/installer/hu/misc-params.xml
index ba2acb12..51461f4d 100644
--- a/docs/docs/stable/installer/hu/misc-params.xml
+++ b/docs/docs/stable/installer/hu/misc-params.xml
@@ -1,22 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Summary of miscellaneous parameters</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
-
-  <para xml:id="misc-params-pa1" revision="1">DrakX made smart choices for the configuration of your system depending on
-the choices you made and on the hardware DrakX detected. You can check the
-settings here and change them if you want after pressing
-<guibutton>Configure</guibutton>.</para>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+  <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
 
   <note>
-    <para>As a general rule, default settings are recommended and you can keep them
-with 3 exceptions:<itemizedlist>
+    <para>As a general rule, it is recommended that you accept the default settings
+unless:<itemizedlist>
         <listitem>
           <para>there are known issues with a default setting</para>
         </listitem>
@@ -26,7 +42,7 @@ with 3 exceptions:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>something else is said in the detailed sections below</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,47 +54,47 @@ with 3 exceptions:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Időzóna</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selected a time zone for you, depending on your preferred
-language. You can change it if needed. See also <xref
-linkend="configureTimezoneUTC"/></para>
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Ország / Régió</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
-        <para xml:id="misc-params-system-pa3a" revision="1">If you are not in the selected country, it is very important that you
-correct the setting. See <xref linkend="selectCountry"/></para>
+        <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
+setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Rendszerbetöltő</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX has made good choices for the bootloader setting.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure Grub2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">For more information, see <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Felhasználókezelő</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each get their own
-<literal>/home</literal> directories.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Szolgálatások</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
-        <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run the background
-(daemons). This tool allows you to enable or disable certain tasks.</para>
+        <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
+(daemons).  This tool allows you to enable or disable certain processes.</para>
 
         <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
-prevent your computer from operating correctly.</para>
-
-        <para>For more information, see <xref linkend="configureServices"/></para>
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -90,10 +106,10 @@ prevent your computer from operating correctly.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Billentyűzet</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa1a" revision="1">This is where you setup or change your keyboard layout which will depend on
-your location, language or type of keyboard.</para>
+        <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
+of keyboard.</para>
 
         <note>
           <para>If you notice a wrong keyboard layout and want to change it, keep in mind
@@ -102,27 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Egér</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add or configure other pointing devices, tablets, trackballs
 etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Hangkártya</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver, if there is a default one. The option
-to select a different driver is only given when there is more than one
-driver for your card, but none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Graphical interface</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphic card(s) and displays.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">For more information, see <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -137,28 +158,28 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Hálózat</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, in the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
-          <para xml:id="misc-params-network-pa3" revision="1">When you add a network card, do not forget to set your firewall to watch
+          <para xml:id="misc-params-network-pa3" revision="1">When you add a network card, do not forget to set your firewall to monitor
 that interface as well.</para>
         </warning>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxies</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
         <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
-internet.  This section allows you to configure your computer to utilize a
+Internet.  This section allows you to configure your computer to utilize a
 proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -170,26 +191,31 @@ need to enter here</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Biztonsági szint</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Here you set the Security level for your computer, in most cases the default
-setting (Standard) is adequate for general use.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Check the option which best suits your usage.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Tűzfal</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">A firewall is intended to be a barrier between your important data and the
-rascals out there on the internet who would compromise or steal it.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing everything (no firewall) may be very risky.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/hu/reboot.xml b/docs/docs/stable/installer/hu/reboot.xml
index 8dba95eb..b659071b 100644
--- a/docs/docs/stable/installer/hu/reboot.xml
+++ b/docs/docs/stable/installer/hu/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="hu" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Újraindítás</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/hu/securityLevel.xml b/docs/docs/stable/installer/hu/securityLevel.xml
index 79579193..50e55d0a 100644
--- a/docs/docs/stable/installer/hu/securityLevel.xml
+++ b/docs/docs/stable/installer/hu/securityLevel.xml
@@ -1,32 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="securityLevel" version="5.0" xml:lang="hu">
+<section version="5.0" xml:lang="hu" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="securityLevel-ti1">Biztonsági szint</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="securityLevel-ti1">Biztonsági szint</title>
-    </info>
+  
 
- 
- 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-securityLevel.png"
-align="center" format="PNG" xml:id="securityLevel-im1"></imagedata>
-</imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
-    <para revision="1" xml:id="securityLevel-pa1">You can adjust your security level here.</para>
+  <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-    <para revision="1" xml:id="securityLevel-pa2">Leave the default settings as they are, if you don't know what to choose.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
 
-    <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> part of the Mageia Control Center.</para>
-  </section>
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
+  <para><emphasis role="bold">Security Administrator</emphasis></para>
+
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
+send <emphasis>security alert messages</emphasis> when it detects situations
+which require notification to a system administrator.</para>
+
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
+
+  <note>
+    <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
+messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
+be configured for receiving such mail!</para>
+  </note>
+
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/hu/selectCountry.xml b/docs/docs/stable/installer/hu/selectCountry.xml
index 0cbb25fb..6d1d84a0 100644
--- a/docs/docs/stable/installer/hu/selectCountry.xml
+++ b/docs/docs/stable/installer/hu/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="hu">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="hu">
   <info>
     <title xml:id="selectCountry-ti1">Ország / Régió kiválasztása</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> button and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem a country from the
-first list was chosen. Please ignore this, DrakX will follow your real
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,18 +40,19 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Beviteli mód</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
-manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar
+manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
 functions and can be installed if you added HTTP/FTP media before package
 selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via "Configure your Computer" ->
-"System", or by running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/selectInstallClass.xml b/docs/docs/stable/installer/hu/selectInstallClass.xml
index ec8212a8..630f3064 100644
--- a/docs/docs/stable/installer/hu/selectInstallClass.xml
+++ b/docs/docs/stable/installer/hu/selectInstallClass.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- 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="hu" xml:id="selectInstallClass">
+<section version="5.0" xml:lang="hu" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
 
   
 
@@ -14,6 +15,13 @@
   
 
   
+
+  
+
+  
+
+  
+
   
 
   <info>
@@ -23,52 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Telepítés vagy Frissítés</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectInstallClass.png" align="center"
-format="PNG"></imagedata> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Telepítés</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option for a fresh <application>Mageia</application> installation.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Frissítés</para>
-
-      <para>If you have one or more <application>Mageia</application> installations on
-your system, the installer will allow you to upgrade one of them to the
-latest release.</para>
-
-<warning>
-	<para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that had already
-reached its End	Of Life when this one was released, then it is better to do
-a clean install while preserving your <literal>/home</literal> partition.</para>
-</warning>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
+
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that you are very sure rebooting is what you
-want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl
-F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the "Install or Upgrade" screen to the language choice
-screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do
-<emphasis>not</emphasis> do this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
 </section>
diff --git a/docs/docs/stable/installer/hu/selectKeyboard.xml b/docs/docs/stable/installer/hu/selectKeyboard.xml
index 582f900e..8bd76ca1 100644
--- a/docs/docs/stable/installer/hu/selectKeyboard.xml
+++ b/docs/docs/stable/installer/hu/selectKeyboard.xml
@@ -10,9 +10,18 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Billentyűzet</title>
   </info>
 
@@ -20,7 +29,7 @@
 keyboard is found it will default to a US keyboard layout.</para>
 
   <mediaobject>
-<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png" />
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
@@ -34,23 +43,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a full list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this anomaly
-and continue the installation: Your keyboard is the one you chose from the
-full list.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
       <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
-extra dialog screen asking how you would prefer to switch between the Latin
-and non-Latin keyboard layouts</para>
+extra dialogue screen asking how you would prefer to switch between the
+Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/hu/selectKeyboardLive.xml b/docs/docs/stable/installer/hu/selectKeyboardLive.xml
index 738c5fbe..18c33761 100644
--- a/docs/docs/stable/installer/hu/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/hu/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Billentyűzet kiválasztás</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>You will be required to set the keyboard layout you wish to use in
-Mageia​​. The default one is selected according to your language and
-timezone previously selected.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/hu/selectLanguage.xml b/docs/docs/stable/installer/hu/selectLanguage.xml
index b7575436..7f47d70d 100644
--- a/docs/docs/stable/installer/hu/selectLanguage.xml
+++ b/docs/docs/stable/installer/hu/selectLanguage.xml
@@ -1,9 +1,33 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="hu" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
   
+
   
+
   
+
   
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 04 01, using barjac's text -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -12,41 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Válasszon nyelvet</title>
   </info>
-  <para condition="classical">Select your preferred language, by first expanding the list for your
-continent. <application>Mageia</application> will use this selection during
-the installation and for your installed system.</para>
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
-  <para condition="classical">If it is likely that you will require several languages installed on your
-system, for yourself or other users, then you should use the
-<guibutton>Multiple languages</guibutton> button to add them now. It will be
-difficult to add extra language support after installation.</para>
+
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
+
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
+
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
-  <warning condition="classical">
-    <para>Even if you choose more than one language, you must first choose one of them
-as your preferred language in the first language screen. It will also be
-marked as chosen in the multiple languages screen .</para>
-  </warning>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
+
   <itemizedlist>
     <listitem condition="classical">
       <para>If your keyboard language is not the same as your preferred language, then
-it is advisable to install the language of your keyboard as well.</para>
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
+
     <listitem>
-      <para>Mageia uses UTF-8 (Unicode) support by default.</para>
-      <para condition="classical">This may be disabled in the "multiple languages" screen if you know that it
-is inappropriate for your language. Disabling UTF-8 applies to all installed
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
 languages.</para>
     </listitem>
+
     <listitem>
-      <para>You can change the language of your system after installation in the Mageia
-Control Center -> System -> Manage localization for your system.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hu/selectMouse.xml b/docs/docs/stable/installer/hu/selectMouse.xml
index a74221f3..609f9cff 100644
--- a/docs/docs/stable/installer/hu/selectMouse.xml
+++ b/docs/docs/stable/installer/hu/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="hu">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Egér kiválasztás</title>
   </info>
@@ -7,25 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">If you are not happy with how your mouse responds, you can select a
 different one here.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB
-mice</guilabel> is a good choice.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to
-configure the buttons that do not work on a mouse with six or more buttons.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/hu/setupBootloader.xml b/docs/docs/stable/installer/hu/setupBootloader.xml
index 561d11aa..592f66f7 100644
--- a/docs/docs/stable/installer/hu/setupBootloader.xml
+++ b/docs/docs/stable/installer/hu/setupBootloader.xml
@@ -1,228 +1,198 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="hu" xml:id="setupBootloader">
+  
+  
+  
+  
   
-
   
-
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Rendszerindítási beállítások</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
-
   <section>
-    <title>Bootloader interface</title>
-
-    <para>By default, Mageia uses exclusively:</para>
-
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-
-    <section>
-      <title>Grub2 on Legacy/MBR and Legacy/GPT systems</title>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-
-      <para>Don't modify the "Boot Device" unless you really know what you are doing.</para>
-    </section>
-
-    <section>
-      <title>Grub2-efi on UEFI systems</title>
-
-      <para>With an UEFI system, the user interface is slightly different as you cannot
-choose between with or without graphical menu</para>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to receive the bootloader
-(Grub2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds grub2-efi. Although it is possible to have
-several ESPs, only one is advised and enough whatever the number of
-operating systems you have.</para>
-
-      <para>Don't modify the "Boot Device" unless you really know what you are doing.</para>
-    </section>
-  </section>
-
-  <section>
-    <title xml:id="setupMageiaBootloader">Using a Mageia bootloader</title>
-
-    <para>By default, according to your system, Mageia writes a new:</para>
-
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard
-drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then uncheck the box
-<guilabel>Probe Foreign OS</guilabel></para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
-  </section>
-
-  <section>
-    <title>Using an existing bootloader</title>
-
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this help, however in most cases it will involve
-running the relevant bootloader installation program which should detect and
-add it automatically. See the documentation for the operating system in
-question.</para>
-  </section>
-
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-
-    <para>If you don't want a bootable Mageia, but to chain load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
   </section>
-
   <section>
-    <title>Beállítások</title>
-
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>Előző oldal</title>
-
-      <para><itemizedlist>
-          <listitem>
-            <para><guilabel>Delay before booting the default image</guilabel>: This text box
-lets you set a delay in seconds before the default operating system is
-started up.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be asked at the boot
-time to select a booting entry or change settings. The username is "root"
-and the password is the one chosen here after.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Password</guilabel>: This text box is where you actually put the
-password</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Password (again)</guilabel>: Retype the password and Drakx will
-check that it matches with the one set above.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Advanced</guilabel></para>
-
-            <itemizedlist>
-              <listitem>
-                <para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for the power management. It can save energy by
-stopping unused devices, this was the method used before APM. Unchecking it
+      <title>Rendszerindítási beállítások</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable SMP</guilabel>: This option enables / disables symmetric
-multiprocessing for multi core processors.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the
-operating system access to the Advanced Programmable Interrupt
-Controller. APIC devices permit more complex priority models, and Advanced
-IRQ (Interrupt Request)  management.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which
-manages all external interrupts for a specific processor in an SMP system.</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist></para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
-
     <section>
-      <title>Következő oldal</title>
-
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
-
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist>
-              <listitem>
-                <para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-the boot menu will use. If you click the down triangle you will be offered
-other size and colour depth options.</para>
-              </listitem>
-
-              <listitem>
-                <para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para>
-              </listitem>
-            </itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Using an existing bootloader</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Add or Modify a Boot Menu Entry</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/setupBootloaderAddEntry.xml b/docs/docs/stable/installer/hu/setupBootloaderAddEntry.xml
index c1edc5da..3b58e4da 100644
--- a/docs/docs/stable/installer/hu/setupBootloaderAddEntry.xml
+++ b/docs/docs/stable/installer/hu/setupBootloaderAddEntry.xml
@@ -1,15 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns5="http://www.w3.org/2000/svg" version="5.0" xml:lang="hu" xml:id="setupBootloaderAddEntry">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="setupBootloaderAddEntry">
   
+
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
 
 Lebarhon 2016 12 16 Updated for Mageia 6-->
 <title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
   </info>
-  <para>To do that you need to manually edit /boot/grub2/custom.cfg or use the
-software grub-customizer instead (Available in the Mageia repositories).</para>
+
+  <para>To do this you need to manually edit /boot/grub2/custom.cfg or use the
+software <emphasis role="bold">grub-customizer</emphasis> tool instead
+(available in the Mageia repositories).</para>
+
   <note>
-    <para>For more information, see our wiki: <link
+    <para>For more information, see: <link
 ns2:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
   </note>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/setupSCSI.xml b/docs/docs/stable/installer/hu/setupSCSI.xml
index 1dc20a79..0264721c 100644
--- a/docs/docs/stable/installer/hu/setupSCSI.xml
+++ b/docs/docs/stable/installer/hu/setupSCSI.xml
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="setupSCSI" version="5.0" xml:lang="hu">
-
+<section version="5.0" xml:lang="hu" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">SCSI beállítás</title>
   </info>
 
   
+
   
+
   
+
   
-   
+
   
+
   
+
   
+
   
+
   
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- JohnR - edited 2012-03-03 -->
@@ -30,16 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata revision="1" fileref="dx2-setupSCSI.png"
-format="PNG" align="center" xml:id="setupSCSI-im1"></imagedata>
-</imageobject></mediaobject>
-
-  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX usually detects hard disks correctly. With some older SCSI controllers
-it may be unable to determine the correct drivers to use and subsequently
-fail to recognise the drive.</para>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell Drakx which SCSI drive(s)
-you have.</para>
+  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
+SCSI controllers it may be unable to determine the correct drivers to use
+and subsequently fail to recognise the drive.</para>
 
-  <para revision="3" xml:id="setupSCSI-pa3">DrakX should then be able to configure the drive(s) correctly.</para>
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
 </section>
diff --git a/docs/docs/stable/installer/hu/software.xml b/docs/docs/stable/installer/hu/software.xml
new file mode 100644
index 00000000..c0ec6656
--- /dev/null
+++ b/docs/docs/stable/installer/hu/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="hu" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/hu/soundConfig.xml b/docs/docs/stable/installer/hu/soundConfig.xml
index 979e5e2e..bc4b1359 100644
--- a/docs/docs/stable/installer/hu/soundConfig.xml
+++ b/docs/docs/stable/installer/hu/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="hu">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Hang beállítása</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if we have a default
-one.</para>
+  
 
-  <para>The default driver should work without problems. However, if after install
-you do encounter problems, then run <command>draksound</command> or start
-this tool via MCC (Mageia Control Center), by choosing the
-<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound
-Configuration</guilabel> at the top right of the screen.</para>
+  
 
-  <para>Then, in the draksound or "Sound Configuration" tool screen, click on
-<guibutton>Advanced</guibutton> and then on
-<guibutton>Troubleshooting</guibutton> to find very useful advice about how
-to solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Speciális</title>
     </info>
 
-    <para>Clicking <guibutton>Advanced</guibutton> in this screen, during install, is
-useful if there is no default driver and there are several drivers
-available, but you think the installer selected the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on
-<guibutton>Let me pick any driver</guibutton>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/hu/takeOverHdConfirm.xml b/docs/docs/stable/installer/hu/takeOverHdConfirm.xml
index 6ec75e28..3323f2d3 100644
--- a/docs/docs/stable/installer/hu/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/hu/takeOverHdConfirm.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="hu" xml:id="takeOverHdConfirm">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Confirm hard disk to be formatted</title>
   </info>
@@ -7,7 +13,11 @@
   
 
   
+
   
+
+  
+
   
 
   
@@ -19,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition='live'> <imagedata
-fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
-fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <guibutton>Previous</guibutton> if you are not sure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <guibutton>Next</guibutton> if you are sure and want to erase every
-partition, every operating system and all data on that hard disk.</para>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/hu/testing.xml b/docs/docs/stable/installer/hu/testing.xml
index c65b9d0d..afe550be 100644
--- a/docs/docs/stable/installer/hu/testing.xml
+++ b/docs/docs/stable/installer/hu/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testing Mageia as Live system</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Élő mód</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>You get this screen if you selected "Boot Mageia". If not, you get the
-"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Hardver tesztelése</title>
       </info>
 
-      <para>One of the Live mode goals is to test if the hardware is correctly managed
-by Mageia. You can check if all devices have a driver in the Hardware
-section of the Mageia Control Center. You can test the most current devices:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>graphical card: if you see the previous screen, it's already OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webkamera:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>printer: configure it and print a test page</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
       </itemizedlist>
 
-      <para>If all is OK for you, you can process to the installation. If not, you can
-leave with the quit button.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>The configuration settings you made here are kept for the installation.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,15 +68,14 @@ leave with the quit button.</para>
         <title xml:id="testing3-ti1">Telepítés indítása</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
-SSD drive, simply click on the icon "Install on Hard Disk". You will get
-this screen, and then the "<link
-linkend="doPartitionDisks">Partitioning</link> step" as for the direct
-installation.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/hu/uninstall-Mageia.xml b/docs/docs/stable/installer/hu/uninstall-Mageia.xml
index 0b57d0c0..aad44b3a 100644
--- a/docs/docs/stable/installer/hu/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/hu/uninstall-Mageia.xml
@@ -1,38 +1,48 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="hu">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="hu" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Mageia eltávolítás</title>
   </info>
 
   
 
-  <section>
-    <title xml:id="uninstall-Mageia-ti2">Hogyan</title>
+  
 
-    <para>If Mageia didn't convince you or you can't install it correctly, in short
-you want get rid of it. That is your right and Mageia also gives you the
+  <para>If Mageia didn't convince you or you can't install it correctly - in short
+you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-    <para>After your data backup, reboot your installation Mageia DVD and select
-Rescue system, then, Restore Windows boot loader. At the next boot, you will
-only have Windows with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-    <para>To recover the space used by Mageia partitions on Windows, click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code> to access to the partition
-management. You will recognize the Mageia partition because they are labeled
-<guilabel>Unknown</guilabel>, and also by their size and place in the
-disk. Right click on each of these partitions and select
-<guibutton>Delete</guibutton>. The space will be freed.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-    <para>If you are using Windows XP, you can create a new partition and format it
-(FAT32 or NTFS). It will get a partition letter.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
-    <para>If you have Vista or 7, you have one more possibility, you can extend the
-existing partition that is at the left of the freed space.  There are other
-partitioning tools that can be used, such as gparted, available for both
-windows and linux. As always, when changing partitions, be very careful, and
-make sure all important things have been backed up.</para>
-  </section>
-</section>
\ No newline at end of file
+  <para>If you have Vista or 7, you have one more possibility, you can extend the
+existing partition that is at the left of the freed space. There are other
+partitioning tools that can be used, such as <emphasis
+role="bold">gparted</emphasis>, available for both Windows and Linux. As
+always, when changing partitions, be very careful to back up anything
+important to you.</para>
+</section>
diff --git a/docs/docs/stable/installer/hu/unused.xml b/docs/docs/stable/installer/hu/unused.xml
index ee9bf187..bb083430 100644
--- a/docs/docs/stable/installer/hu/unused.xml
+++ b/docs/docs/stable/installer/hu/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="hu" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="hu">
   <info>
     <title xml:id="unused-ti1">Nem használt fájlok megtartása vagy törlése</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
 
-  <para>Ebben a lépésben a Telepítő nem használt nyelvi fájlokat és hardver
-csomagokat keres. Ezután felajánlja a törlésüket. Jó ötlet elfogadni a
-törlést, kivéve, ha olyan telepítést készít, amelyet másik hardveren tervez
-használni.</para>
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>A következő lépés a fájlok lemezre másolása. Ez több percet vehet igénybe. A
-végén a képernyő rövid időre elsötétülhet, ez normális.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/id/DrakLive-cover.xml b/docs/docs/stable/installer/id/DrakLive-cover.xml
index 1772aa63..79e626f1 100644
--- a/docs/docs/stable/installer/id/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/id/DrakLive-cover.xml
@@ -1,75 +1,103 @@
-<?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="id" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="id" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Installation from LIVE medium</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>January 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Installation from LIVE medium</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Dokumentasi Resmi Mageia</para>
+      <para role="tagline">Dokumentasi Resmi Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Teks dan gambar pada manual ini berada di bawah lisensi CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-            </para>
-            <para>Manual ini dibuat dengan bantuan <link ns6:href="http://www.calenco.com">CMS
+
+      <para>Teks dan gambar pada manual ini berada di bawah lisensi CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Manual ini dibuat dengan bantuan <link ns6:href="http://www.calenco.com">CMS
 Calenco</link> yang dibangun oleh <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-            </para>
-            <para>Ini ditulis oleh sukarelawan di waktu senggang mereka. Silakan hubungi <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Ini ditulis oleh sukarelawan di waktu senggang mereka. Silakan hubungi <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Tim
-Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para> 
+Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para>
     </cover>
   </info>
+
   <article>
     <title>Installation from LIVE medium</title>
-       <para><note>
-          <para>Tidak seorang pun akan melihat semua layar installer yang Anda lihat dalam
+
+    <para><note>
+        <para>Tidak seorang pun akan melihat semua layar installer yang Anda lihat dalam
 manual ini. Layar mana yang akan Anda lihat, tergantung pada hardware dan
 pilihan yang Anda buat saat menginstall.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/id/DrakLive.xml b/docs/docs/stable/installer/id/DrakLive.xml
index 1e79ead5..26d270d1 100644
--- a/docs/docs/stable/installer/id/DrakLive.xml
+++ b/docs/docs/stable/installer/id/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="id" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="id" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Installation from LIVE medium</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Installation from LIVE medium</title>
 
     <cover>
       <para><note>
@@ -16,9 +31,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 Calenco</link> yang dibangun oleh <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>Ini ditulis oleh sukarelawan di waktu senggang mereka. Silakan hubungi <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Tim
-Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</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>
 
@@ -38,7 +53,12 @@ Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -48,17 +68,18 @@ Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/id/DrakX-cover.xml b/docs/docs/stable/installer/id/DrakX-cover.xml
index 0ade506f..5325ccce 100644
--- a/docs/docs/stable/installer/id/DrakX-cover.xml
+++ b/docs/docs/stable/installer/id/DrakX-cover.xml
@@ -1,114 +1,153 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="id" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="id" xml:id="Quick-Startup"
+      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>Instalasi dengan DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Februari 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Februari 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Dokumentasi Resmi Mageia</para>
+      <para role="tagline">Dokumentasi Resmi Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>Teks dan gambar pada manual ini berada di bawah lisensi CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Manual ini dibuat dengan bantuan <link ns6:href="http://www.calenco.com">CMS
+
+      <para>Teks dan gambar pada manual ini berada di bawah lisensi CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Manual ini dibuat dengan bantuan <link ns6:href="http://www.calenco.com">CMS
 Calenco</link> yang dibangun oleh <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>Ini ditulis oleh sukarelawan di waktu senggang mereka. Silakan hubungi <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Ini ditulis oleh sukarelawan di waktu senggang mereka. Silakan hubungi <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Tim
-Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para> 
+Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Instalasi dengan DrakX</title>
-       <para><note>
-          <para>Tidak seorang pun akan melihat semua layar installer yang Anda lihat dalam
+
+    <para><note>
+        <para>Tidak seorang pun akan melihat semua layar installer yang Anda lihat dalam
 manual ini. Layar mana yang akan Anda lihat, tergantung pada hardware dan
 pilihan yang Anda buat saat menginstall.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -116,29 +155,32 @@ pilihan yang Anda buat saat menginstall.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/id/DrakX-inline.xml b/docs/docs/stable/installer/id/DrakX-inline.xml
new file mode 100644
index 00000000..27b71800
--- /dev/null
+++ b/docs/docs/stable/installer/id/DrakX-inline.xml
@@ -0,0 +1,137 @@
+<?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="id" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Instalasi dengan DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>Tidak seorang pun akan melihat semua layar installer yang Anda lihat dalam
+manual ini. Layar mana yang akan Anda lihat, tergantung pada hardware dan
+pilihan yang Anda buat saat menginstall.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Teks dan gambar pada manual ini berada di bawah lisensi CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Manual ini dibuat dengan bantuan <link ns6:href="http://www.calenco.com">CMS
+Calenco</link> yang dibangun oleh <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Ini ditulis oleh sukarelawan di waktu senggang mereka. Silakan hubungi <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Tim
+Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/DrakX.xml b/docs/docs/stable/installer/id/DrakX.xml
index 306d0c81..01475dca 100644
--- a/docs/docs/stable/installer/id/DrakX.xml
+++ b/docs/docs/stable/installer/id/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="id" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="id" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Instalasi dengan DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Instalasi dengan DrakX</title>
 
     <cover>
       <para><note>
@@ -33,18 +71,6 @@ Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -59,23 +85,28 @@ Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -85,7 +116,10 @@ Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -93,19 +127,25 @@ Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -113,11 +153,15 @@ Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -136,4 +180,4 @@ Dokumentasi</link>, jika Anda ingin membantu memperbaiki manual ini.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/id/SelectAndUseISOs2.xml b/docs/docs/stable/installer/id/SelectAndUseISOs2.xml
index 8b218ffa..207ba762 100644
--- a/docs/docs/stable/installer/id/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/id/SelectAndUseISOs2.xml
@@ -1,40 +1,75 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="id" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Pilih dan gunakan ISO</title>
   </info>
   <section>
     <title>Pengantar</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
-which image match your needs.</para>
-    <para>There is two families of media:</para>
+which image best suits your needs.</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: After booting the media, it will follow a process
-allowing to choose what to install and how to configure your target
-system. This give you the maximal flexibility for a customized installation,
-in particular to choose which Desktop Environment you will install.</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
       </listitem>
       <listitem>
-        <para>LIVE media: you can boot the media in a real Mageia system without
-installing it, to see what you will get after installation.  The
-installation process is simpler, but you get lesser choices.</para>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Details are given in the next sections.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Media</title>
     <section>
       <title>Definisi</title>
-      <para>Di sini, medium (jamak: media) adalah berkas image ISO yang memungkinkan
-Anda menginstall dan/atau mengupdate Mageia dan dengan perluasan dukungan
-fisik ke mana berkas ISO disalin.</para>
-      <para>Anda bisa menemukannya <link
-ns4:href="http://www.mageia.org/id/downloads/">di sini</link>.</para>
+      <para>Here, a medium (plural: media) is an ISO image file that allows you to
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
+      <para>You can find Mageia ISO's <link
+ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
     <section>
       <title>Media instalasi klasik</title>
@@ -42,23 +77,25 @@ ns4:href="http://www.mageia.org/id/downloads/">di sini</link>.</para>
         <title>Fitur umum</title>
         <itemizedlist>
           <listitem>
-            <para>ISO ini menggunakan installer tradisional yang disebut drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
-            <para>Mereka bisa membuat instalasi baru atau update dari rilis sebelumnya.</para>
+            <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Media berbeda untuk arsitektur 32 atau 64 bit.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Beberapa peralatan tersedia pada Layar sambutan: Sistem Penyelamat,
-Pengujian Memori, Peralatan Pendeteksi Perangkat Keras.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Setiap DVD berisi banyak lingkungan desktop dan bahasa yang tersedia.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Anda akan diberikan untuk memilih perangkat lunak non free saat instalasi.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -69,22 +106,20 @@ Pengujian Memori, Peralatan Pendeteksi Perangkat Keras.</para>
         <title>Fitur umum</title>
         <itemizedlist>
           <listitem>
-            <para>Bisa digunakan untuk melihat distribusi tanpa menginstallnya pada HDD, dan
-opsi untuk menginstall Mageia pada HDD Anda.</para>
+            <para>Can be used to preview the Mageia operating system without having to install
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Media berbeda untuk arsitektur 32 atau 64 bit.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">ISO Live hanya bisa digunakan untuk membuat instalasi
-baru, mereka tidak bisa digunakan untuk upgrade dari rilis
-sebelumnya.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Mereka berisi perangkat lunak non free.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -92,13 +127,13 @@ sebelumnya.</emphasis></para>
         <title>Live DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Plasma desktop environment only.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Menyediakan semua bahasa.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -106,13 +141,13 @@ sebelumnya.</emphasis></para>
         <title>Live DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>Hanya lingkungan desktop GNOME.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Menyediakan semua bahasa.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -120,39 +155,27 @@ sebelumnya.</emphasis></para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Xfce desktop environment only.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Menyediakan semua bahasa.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 or 64 bit architectures.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
     </section>
     <section>
-      <title>Media CD hanya-boot</title>
+      <title>Net install media</title>
       <section>
         <title>Fitur umum</title>
         <itemizedlist>
           <listitem>
-            <para>Masing-masing adalah image kecil yang berisi tidak lebih dari apa yang
-diperlukan untuk menjalankan installer drakx dan menemukan
-drakx-installer-stage2 dan paket-paket lain yang dibutuhkan untuk
-melanjutkan dan menyelesaikan instalasi. Paket-paket ini mungkin berada
-dalam harddisk PC, drive lokal, jaringan lokal atau Internet.</para>
-          </listitem>
-          <listitem>
-            <para>Media ini sangat ringan (kurang dari 100 MB) dan cocok ketika bandwidth
-sangat lambat untuk mendownload DVD, PC tanpa drive DVD atau PC yang tidak
-bisa boot dari USB.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Media berbeda untuk arsitektur 32 atau 64 bit.</para>
-          </listitem>
-          <listitem>
-            <para>Hanya bahasa Inggris.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -160,8 +183,8 @@ bisa boot dari USB.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -169,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Berisi perangkat lunak tidak bebas (kebanyakan adalah driver, kodek...)
-untuk orang-orang yang membutuhkannya.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -181,62 +203,88 @@ untuk orang-orang yang membutuhkannya.</para>
     <section>
       <title>Mengunduh</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
-BitTorrent. In both cases, a window gives you some information, such as the
-mirror in use and an opportunity to change if the bandwidth is to low. If
-http is chosen, you may also see something like</para>
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
-them. Keep one of them <link linkend="integrity">for further
-usage</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Centang tombol Simpan Berkas.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
-      <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
-file to be downloaded. When you ask these algorithms to recalculate this
-number from your downloaded file, either you have the same number and your
-downloaded file is correct, or the number is different and you have a
-failure. A failure infers that you should retry the download or attempt a
-repair using BitTorrent.</para>
-      <para>Buka konsol, tidak perlu menjadi root, dan:</para>
-      <para>- Untuk menggunakan md5sum, ketik: [sam@localhost]$ <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
-      <para>- Untuk menggunakan sha1sum, ketik: [sam@localhost]$ <userinput>sha1sum
-path/to/the/image/file.iso</userinput>.</para>
-      <para>lalu bandingkan nomor yang diperoleh dari komputer (Anda mungkin harus
-menunggu beberapa saat) dengan nomor yang diberikan oleh Mageia. Contoh:</para>
+      <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
+      <para>To generate the checksum for your downloaded ISO, open a console, (no need
+to be root), and:</para>
+      <itemizedlist>
+        <listitem>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+        <listitem>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+      </itemizedlist>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para/>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Bakar atau salin ISO</title>
-    <para>ISO yang telah diperiksa sekarang bisa dibakar ke sebuah CD atau DVD atau
-disalin ke sebuah flashdisk. Pekerjaan ini bukan penyalinan sederhana dan
-bertujuan untuk membuat media yang dapat diboot.</para>
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
     <section>
       <title>Membakar ISO ke CD/DVD</title>
-      <para>Gunakan burner apapun yang Anda inginkan tapi pastikan perangkat burning
-diatur dengan benar ke <emphasis role="bold">burn image</emphasis>, burn
-data atau berkas adalah salah. Informasi lebih lengkap ada di <link
-ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">wiki
-Mageia</link>.</para>
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
+ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
+wiki</link> for more information.</para>
     </section>
     <section>
       <title>Salin ISO ke flashdisk</title>
-      <para>Semua ISO Mageia adalah hibrid, yang berarti bisa Anda bisa 'menyalin' ke
-flashdisk lalu menggunakannya untuk memboot dan menginstall sistem.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"menyalin" image ke dalam flashdisk akan merusak sistem file pada perangkat;
-data apapun akan hilang dan kapasitas partisi akan berkurang menjadi sebesar
-ukuran image.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>To recover the original capacity, you must redo partitioning and re-format
-the USB stick.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Using a graphical tool within Mageia</title>
         <para>Anda bisa menggunakan peralatan seperti <link
@@ -245,40 +293,51 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
       <section>
         <title>Using a graphical tool within Windows</title>
         <para>Anda bisa mencoba:</para>
-        <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
-        <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
+        <itemizedlist>
+          <listitem>
+            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
+          </listitem>
+          <listitem>
+            <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
+Imager</link></para>
+          </listitem>
+        </itemizedlist>
       </section>
       <section>
-        <title>Using Command line within a GNU/Linux system</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
-          <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
-disc partition if you get the device-ID wrong.</para>
+          <para>It is potentially *dangerous* to do this by hand. You risk overwriting
+potentially valuable existing data if you specify the wrong target device.</para>
         </warning>
-        <para>Anda juga bisa menggunakan dd dari konsol:</para>
         <orderedlist>
           <listitem>
             <para>Buka konsol</para>
           </listitem>
           <listitem>
-            <para>Menjadi root dengan perintah <userinput>su -</userinput> (jangan lupa tanda
-'-' di akhir)</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Pasang flashdisk (jangan dimount, artinya juga jangan buka aplikasi atau
-manajer berkas apapun yang bisa membuka atau membacanya)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Masukkan perintah <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
-            <para>Alternatively, you can get the device name with the command
-<code>dmesg</code>: at end, you see the device name starting with
-<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
-            <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
+          </listitem>
+          <listitem>
+            <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+            <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
+            <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
 [72594.770536] usb 1-1: Product: Mass Storage Device
@@ -295,24 +354,28 @@ manajer berkas apapun yang bisa membuka atau membacanya)</para>
 [72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
 [72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
 [72595.967251]  <emphasis>sdd</emphasis>: sdd1
-[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
-          </listitem>
-          <listitem>
-            <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Masukkan perintah: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX
-bs=1M</userinput></para>
-            <para>Dimana X=nama perangkat Anda misal: /dev/sdc</para>
-            <para>Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
-of=/dev/sdb bs=1M</userinput></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
+            <tip>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
+            </tip>
           </listitem>
           <listitem>
-            <para>Masukkan perintah: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
-            <para>Lepas flashdisk, selesai</para>
+            <para>This is the end of the process, and you may now unplug your USB stick.</para>
           </listitem>
         </orderedlist>
       </section>
diff --git a/docs/docs/stable/installer/id/acceptLicense.xml b/docs/docs/stable/installer/id/acceptLicense.xml
index 41e329dc..af94d18b 100644
--- a/docs/docs/stable/installer/id/acceptLicense.xml
+++ b/docs/docs/stable/installer/id/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,34 +37,44 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Lisensi dan Catatan Rilis</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
-revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
-</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
-revision="5" align="center" condition="live" format="PNG"
-fileref="live-license.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="acceptLicense-im1" fileref="dx2-license.png" align="center"
+revision="4"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-license.png" xml:id="acceptLicense-im2" revision="5"
+align="center" condition="live"/> </imageobject></mediaobject>
 
   <section xml:id="license">
     <info>
       <title xml:id="license-ti1">Perjanjian Lisensi</title>
     </info>
 
-    <para>Sebelum menginstall <application>Mageia</application>, silakan baca syarat
-dan ketentuan lisensi dengan seksama.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Syarat dan ketentuan ini berlaku ke seluruh distribusi
-<application>Mageia</application> dan harus diterima sebelum Anda
-melanjutkan.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Untuk menerima, pilih <guilabel>Terima</guilabel> lalu klik
-<guibutton>Selanjutnya</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Jika Anda memutuskan untuk tidak menerima ketentuan ini, maka terima kasih
-karena telah melihat-lihat. Mengklik <guibutton>Keluar</guibutton> akan
-menyalakan ulang komputer Anda.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -76,7 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Untuk melihat apa yang baru di rilis <application>Mageia</application> ini,
-klik pada tombol <guibutton>Catatan Rilis</guibutton>.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/addUser.xml b/docs/docs/stable/installer/id/addUser.xml
index 7a901a74..38523127 100644
--- a/docs/docs/stable/installer/id/addUser.xml
+++ b/docs/docs/stable/installer/id/addUser.xml
@@ -1,109 +1,134 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="id" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Pengelolaan Pengguna dan Pengguna Super</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
+
   
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Atur Sandi Administrator (root):</title>
     </info>
-    <para>Disarankan untuk semua instalasi <application>Mageia</application> agar
-mengatur sandi superuser atau administrator, biasanya di Linux disebut
-<emphasis>sandi root</emphasis>. Saat Anda mengetik sandi pada kotak atas,
-warna kotak pinggirnya akan berubah dari merah menjadi kuning atau hijau
-tergantung pada kekuatan sandi. Warna hijau menandakan bahwa Anda
-menggunakan sandi yang kuat. Anda harus mengulang sandi yang sama pada kotak
-di bawah kotak sandi pertama, ini memeriksa jika Anda tidak salah mengetik
-sandi pada sandi pertama dengan membandingkannya.</para>
+
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
+
     <note xml:id="givePassword">
-      <para>Semua sandi berlaku sensitif, akan sangat baik untuk menggunakan
-penggabungan huruf (besar dan kecil), nomor dan karakter lain sebagai sandi.</para>
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
+
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Masukkan pengguna</title>
     </info>
-    <para>Tambahkan pengguna di sini. Pengguna memiliki hak yang lebih sedikit
-dibanding superuser (root), tapi cukup untuk menjelajah internet,
-menggunakan aplikasi perkantoran atau memainkan permainan dan hal lain yang
-biasa dilakukan pengguna dengan komputernya</para>
+
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
+
     <itemizedlist>
       <listitem>
-        <para><guibutton>Ikon</guibutton>: jika Anda mengklik tombol ini akan mengubah
-ikon pengguna.</para>
+        <para><emphasis role="bold">Icon</emphasis></para>
+
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Nama Asli</guilabel>: Masukkan nama asli pengguna pada kotak teks
-ini.</para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Nama Login</guilabel>: Di sini Anda memasukkan nama login pengguna
-atau biarkan drakx menggunakan versi dari nama asli pengguna. <emphasis>Nama
-login berlaku sensitif.</emphasis></para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Sandi</guilabel>: Pada kotak teks ini Anda perlu mengetikkan sandi
-pengguna. Terdapat pelindung pada ujung dari kotak teks yang menandakan
-kekuatan sandi. (Lihat juga <xref linkend="givePassword"/>)</para>
-      </listitem>
-      <listitem>
-        <para><guilabel>Sandi (lagi)</guilabel>: Ketik ulang sandi pengguna pada kotak
-teks ini, drakx akan memeriksa bahwa Anda memiliki sandi yang sama pada
-tiap-tiap kotak teks.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
+
     <note>
-      <para>Any user you add while installing Mageia, will have a both read and write
-protected home directory (umask=0027).</para>
-      <para>You can add all extra needed users in the <emphasis>Configuration -
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
+
+      <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
 management</emphasis>.</para>
+
       <para>Perizinan hak akses juga bisa diubah setelah instalasi.</para>
     </note>
   </section>
-  <section xml:id="addUserAdvanced" condition="classical">
+
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Pengelolaan Pengguna Lanjutan</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
-    <para>Jika tombol <guibutton>lanjutan</guibutton> diklik, akan ditampilkan sebuah
-layar yang memungkinkan Anda mengedit pengaturan pengguna yang Anda
-tambahkan.</para>
-    <para condition="classical">Additionally, you can disable or enable a guest account.</para>
-    <warning condition="classical">
-      <para>Apapun yang disimpan oleh akun tamu dengan <emphasis>rbash</emphasis> bawaan
-yang disimpan di direktori /home akan dihapus saat dia keluar.  Tamu harus
-menyimpan file pentingnya ke dalam flashdisk.</para>
-    </warning>
+
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
+
     <itemizedlist>
-      <listitem condition="classical">
-        <para><guilabel>Hidupkan akun tamu</guilabel>: Di sini Anda bisa menghidupkan atau
-mematikan akun tamu. Akun tamu memungkinkan tamu masuk dan menggunakan
-komputer, tapi dia memiliki akses yang lebih terbatas daripada pengguna
-normal.</para>
-      </listitem>
       <listitem>
-        <para><guilabel>Shell</guilabel>: Daftar drop down ini memungkinkan Anda mengubah
-shell yang akan digunakan oleh pengguna yang telah ditambahkan pada layar
-sebelumnya, pilihannya adalah Bash, Dash dan Sh</para>
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>ID pengguna</guilabel>: Di sini Anda bisa mengatur ID untuk
-pengguna yang Anda tambahkan pada layar sebelumnya. Ini adalah nomor.
-Biarkan ini kosong kecuali jika Anda mengetahui apa yang harus diisikan di
-sini.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>ID grup</guilabel>: Ini untuk mengatur ID grup.  Nomor juga,
-biasanya sama dengan pengguna. Biarkan kosong kecuali jika Anda mengetahui
-apa yang harus diisikan di sini.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/id/add_supplemental_media.xml b/docs/docs/stable/installer/id/add_supplemental_media.xml
index d7200af6..495229a0 100644
--- a/docs/docs/stable/installer/id/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/id/add_supplemental_media.xml
@@ -1,54 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="id" xml:id="add_supplemental_media"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="id">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Pemilihan Media (Konfigurasi Media Instalasi Pelengkap)</title>
-    </info>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
+  </info>
 
   
+
+  
+
+  
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
-<imageobject> <imagedata align="center"
-fileref="dx2-add_supplemental_media.png" format="PNG" revision="1"
-xml:id="dx2-add_supplemental_media-im1"/> </imageobject></mediaobject>
-
-  <para>Layar ini memberi Anda daftar repositori yang telah dikenali. Anda bisa
-menambahkan sumber lain, seperti disk optik atau sumber remote. Pemilihan
-sumber menentukan paket-paket mana yang akan tersedia untuk dipilih selama
-langkah-langkah berikutnya.</para>
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
+<imageobject> <imagedata format="PNG"
+fileref="dx2-add_supplemental_media.png"
+xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Untuk sumber jaringan, ada dua langkah yang harus diikuti:</para>
 
   <orderedlist>
     <listitem>
-      <para>Memilih dan mengaktifkan jaringan, jika belum terhubung. </para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
-      <para>Memilih mirror atau menentukan URL (entri paling awal). Dengan memilih
-mirror,  Anda memiliki akses ke semua repositori terpilih yang dikelola oleh
-Mageia, seperti repositori Nonfree, Tainted dan Update. Dengan URL, Anda
-bisa menentukan repositori tertentu atau instalasi NFS Anda.</para>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
-    <note>
-      <para>Jika Anda mengupdate instalasi 64 bit yang mungkin berisi beberapa paket 32
-bit, maka disarankan untuk menggunakan layar ini untuk menambahkan mirror
-online dengan memilih satu dari protokol jaringan di sini. Iso DVD 64 bit
-hanya berisi paket-paket 64 bit dan noarch, dia tidak akan bisa mengupdate
-paket-paket 32 bit. Tapi, setelah menambahkan mirror online, installer akan
-menemukan paket-paket 32 bit di sana.</para>
-     </note>
-
-</section>
+  <note>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/ask_mntpoint_s.xml b/docs/docs/stable/installer/id/ask_mntpoint_s.xml
index fab478ee..dd2140c9 100644
--- a/docs/docs/stable/installer/id/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/id/ask_mntpoint_s.xml
@@ -1,27 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="ask_mntpoint_s" version="5.0" xml:lang="id">
-
+<section version="5.0" xml:lang="id" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Pilih titik kait</title>
   </info>
 
   
+
   
+
   
+
   
+
+  
+
+  
+
   
+
   
+
   
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -33,56 +44,55 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
-xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-chooseMountpoints.png" align="center" format="PNG"
-xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
-
-  <para>Di sini Anda melihat partisi Linux yang ditemukan di komputer. Jika Anda
-tidak setuju dengan saran <application>DrakX</application>, Anda bisa
-mengubah titik kaitnya.</para>
-
-  <note>
-    <para>Jika Anda mengubah apapun, pastikan Anda tetap memiliki partisi
-<literal>/</literal> (root).</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
 
-  <itemizedlist>
-    <listitem>
-      <para>Setiap partisi ditampilkan sebagai berikut: "Perangkat" ("Kapasitas", "Titik
-kait", "Tipe").</para>
-    </listitem>
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
+  <itemizedlist>
     <listitem>
-      <para>"Perangkat", terdiri dari: "harddisk", ["nomor harddisk"(huruf)], "nomor
-partisi" (contohnya, "sda5").</para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
-    
     <listitem>
-      <para>Jika Anda memiliki banyak partisi, Anda bisa memilih banyak titik kait yang
-berbeda dari menu drop down, seperti <literal>/</literal>,
-<literal>/home</literal> dan <literal>/var</literal>. Anda juga bisa membuat
-titik kait sendiri, contohnya <literal>/video</literal> untuk partisi di
-mana Anda ingin menyimpan film, atau <literal>/cauldron-home</literal> untuk
-partisi <literal>/home</literal> instalasi cauldron.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
-      <para>Untuk partisi yang tidak akan Anda akses, Anda bisa membiarkan kolom titik
-kait kosong.</para>
+      <para>For any partitions that you don't need to make use of, you can leave the
+mount point field blank.</para>
     </listitem>
   </itemizedlist>
 
   <warning>
-    <para>Pilih <guibutton>Sebelumnya</guibutton> jika Anda tidak yakin akan memilih
-apa, lalu pilih <guilabel>Pemartisian disk sesuaian</guilabel>. Di layar
-berikutnya, Anda bisa mengklik partisi untuk melihat tipe dan ukurannya.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Jika Anda yakin titik kait sudah benar, klik
-<guibutton>Selanjutnya</guibutton>, lalu pilih apakah Anda hanya akan
-memformat partisi yang disarankan Drakx atau yang lainnya juga.</para>
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
 </section>
diff --git a/docs/docs/stable/installer/id/bestTime.xml b/docs/docs/stable/installer/id/bestTime.xml
index 8a23da28..493f61c9 100644
--- a/docs/docs/stable/installer/id/bestTime.xml
+++ b/docs/docs/stable/installer/id/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="id" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="id" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Clock settings</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>In this step, you have to select on which time your internal clock is set,
-either local time or UTC time.</para>
-
-  <para>In advanced tab, you will find more options about clock settings.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/bootLive.xml b/docs/docs/stable/installer/id/bootLive.xml
index 1e7f0647..86bc2c3b 100644
--- a/docs/docs/stable/installer/id/bootLive.xml
+++ b/docs/docs/stable/installer/id/bootLive.xml
@@ -1,29 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="id"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
-DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
-bootloader to launch the installation automatically after rebooting the
-computer. If that does not happen you may need to reconfigure your BIOS or
-press one key that will offer you to choose the peripheral from which the
-computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
-ISO. According to your BIOS settings, the computer boots perhaps directly on
-the USB device already plugged in a port. If that does not happen you may
-need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
-or USB stick) without writing anything on the disk, so expect a very slow
-system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
-when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
-the inserted installation medium. Here, select other sources, like FTP or
-NFS servers. If the installation is carried out in a network with an SLP
-server, select one of the installation sources available on the server with
-this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
-optional disk with a driver update and will require its insertion during
-installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice)  or to
-process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
-duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para><para>In each case, the first steps will be the same to choose language, timezone
-and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Booting the medium</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>First screen while booting in BIOS mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">In UEFI mode</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/id/chooseDesktop.xml b/docs/docs/stable/installer/id/chooseDesktop.xml
index ef36bd82..1d8ca195 100644
--- a/docs/docs/stable/installer/id/chooseDesktop.xml
+++ b/docs/docs/stable/installer/id/chooseDesktop.xml
@@ -1,29 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Pemilihan Desktop</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Pemilihan Desktop</title>
   </info>
 
   
 
-  <para>Tergantung pada apa yang dipilih di sini, Anda mungkin akan ditawarkan layar
-lanjutan untuk menyesuaikan pilihan.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>Setelah pemilihan langkah, Anda akan melihat tampilan slide selama instalasi
-paket. Tampilan slide bisa dimatikan dengan menekan tombol
-<guilabel>Rincian</guilabel></para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Pilih apakah Anda lebih suka menggunakan lingkungan desktop
-<application>KDE</application> atau
-<application>Gnome</application>. Keduanya disertai dengan seperangkat
-aplikasi dan peralatan yang berguna. Pilih <guilabel>Sesuaian</guilabel>
-jika Anda tidak ingin memilih keduanya atau memilih keduanya, atau jika Anda
-menginginkan yang selain pilihan software bawaan dari lingkungan desktop
-tersebut. Desktop <application>LXDE</application> lebih ringan dari kedua
-lingkungan desktop sebelumnya, kurang terlihat cantik dan lebih sedikit
-paket bawaan yang diinstall.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/id/choosePackageGroups.xml b/docs/docs/stable/installer/id/choosePackageGroups.xml
index b08c05ba..59b7f946 100644
--- a/docs/docs/stable/installer/id/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/id/choosePackageGroups.xml
@@ -1,39 +1,42 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Pemilihan Grup Paket</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
-  <para>Paket telah dipilah ke dalam grup, supaya memilih apa yang dibutuhkan untuk
-sistem Anda lebih mudah. Semua grup dibuat sangat jelas, tapi informasi
-lebih tentang isi dari tiap grup tersedia dalam tool tip yang akan terlihat
-saat mouse di arahkan ke grup-grup tersebut.</para>
+  <para>Packages are arranged into common groups, to make choosing what you need on
+your system a lot easier. The groups are fairly self explanatory, however
+more information about the content of each is available in tool-tips which
+become visible as the mouse is hovered over them.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Lingkungan kerja.</para>
+      <para><emphasis role="bold">Workstation</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Server.</para>
+      <para><emphasis role="bold">Server</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Lingkungan Grafis</para>
+      <para><emphasis role="bold">Graphical Environment</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Pemilihan Paket Individu: Anda bisa menggunakan pilihan ini untuk menambah
-atau menghapus paket secara manual.</para>
+      <para><emphasis role="bold">Individual Package Selection</emphasis>: you can use
+this option to manually add or remove packages</para>
     </listitem>
   </itemizedlist>
 
-  <para>Read <xref linkend="minimal-install"/> for instructions on how to do a
+  <para>See <xref linkend="minimal-install"/> for instructions on how to do a
 minimal install (without or with X &amp; IceWM).</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/choosePackagesTree.xml b/docs/docs/stable/installer/id/choosePackagesTree.xml
index 5d4ceb79..e18e7218 100644
--- a/docs/docs/stable/installer/id/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/id/choosePackagesTree.xml
@@ -1,23 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="choosePackagesTree">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="id">
+  <info>
+    <title xml:id="choosePackagesTree-ti1">Pilih Paket Individual</title>
+  </info>
 
-    <info>
-      <title xml:id="choosePackagesTree-ti1">Pilih Paket Individual</title>
-    </info>
+  
 
-    
+  
 
-<mediaobject>
-<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
-<imageobject> <imagedata fileref="dx2-choosePackagesTree.png" align="center"
-format="PNG" ></imagedata> </imageobject></mediaobject>
+  
 
-    <para>Di sini Anda bisa menambah atau menghapus paket tambahan apapun untuk
-menyesuaikan instalasi.</para>
+  <mediaobject>
+<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
+align="center"/> </imageobject></mediaobject>
 
-    <para>Setelah selesai memilih, Anda bisa mengklik <guibutton>ikon
-floppy</guibutton> di bawah halaman untuk menyimpan pilihan paket (bisa juga
-disimpan ke flashdisk). Anda bisa menggunakan file ini untuk menginstall
-paket yang sama pada komputer lain, dengan menekan tombol yang sama saat
-instalasi dan memuatnya.</para>
-  </section>
+  <para>Here you can add or remove any extra packages to customize your
+installation.</para>
 
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/configureServices.xml b/docs/docs/stable/installer/id/configureServices.xml
index fded0a73..f1fb2f10 100644
--- a/docs/docs/stable/installer/id/configureServices.xml
+++ b/docs/docs/stable/installer/id/configureServices.xml
@@ -1,40 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="configureServices" version="5.0" xml:lang="id">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="id" xml:id="configureServices">
+  <info>
+    <title xml:id="configureServices-ti1">Konfigurasikan Layanan Anda</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="configureServices-ti1">Konfigurasikan Layanan Anda</title>
-    </info>
+  
 
-    
-   
+  
 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureServices.png"
-align="center" format="PNG" xml:id="configureServices-im1"></imagedata>
-</imageobject></mediaobject>
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
+xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
+  <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-    <para revision="1" xml:id="configureServices-pa1">Di sini Anda bisa mengatur layanan mana yang (tidak) harus dijalankan saat
-komputer dinyalakan.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-    <para revision="1" xml:id="configureServices-pa2">Ada empat grup, klik pada segitiga sebelum grup untuk membentangkan dan
-melihat layanan yang ada di dalamnya.</para>
-
-    <para revision="1" xml:id="configureServices-pa3">Pengaturan pilihan DrakX biasanya sudah bagus.</para>
-
-    <para revision="1" xml:id="configureServices-pa4">Jika Anda menyorot sebuah layanan, informasi tentangnya akan ditampilkan
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Jika Anda menyorot sebuah layanan, informasi tentangnya akan ditampilkan
 dalam kotak informasi di bawah.</para>
+    </listitem>
+  </itemizedlist>
 
-    <para revision="1" xml:id="configureServices-pa5">Hanya ubah sesuatu jika Anda sangat mengetahui hal tersebut.</para>
-  </section>
-
+  <para xml:id="configureServices-pa5" revision="1">Hanya ubah sesuatu jika Anda sangat mengetahui hal tersebut.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/configureTimezoneUTC.xml b/docs/docs/stable/installer/id/configureTimezoneUTC.xml
index ac5801fd..300b7565 100644
--- a/docs/docs/stable/installer/id/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/id/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="configureTimezoneUTC">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="id">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Konfigurasi Zona Waktu Anda</title>
   </info>
@@ -7,20 +7,30 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject condition="classical"> <imagedata
-xml:id="configureTimezoneUTC-im1" revision="1"
-fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
-</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
-condition="live" format="PNG"/> </imageobject></mediaobject>
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="configureTimezoneUTC-im1" align="center"
+fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa1">Pilih zona waktu Anda dengan memilih negara Anda atau sebuah kota yang dekat
-dengan Anda dengan zona waktu yang sama.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa2">Pada layar berikutnya Anda bisa memilih untuk mengatur jam hardware Anda ke
-waktu lokal atau GMT, atau disebut juga UTC.</para>
+  <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
+or to GMT, also known as UTC.</para>
 
   <note>
     <para revision="1" xml:id="configureTimezoneUTC-pa3">Jika Anda memiliki lebih dari satu sistem operasi pada komputer, pastikan
diff --git a/docs/docs/stable/installer/id/configureX_card_list.xml b/docs/docs/stable/installer/id/configureX_card_list.xml
index 75a61019..6a138217 100644
--- a/docs/docs/stable/installer/id/configureX_card_list.xml
+++ b/docs/docs/stable/installer/id/configureX_card_list.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="configureX_card_list">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
@@ -6,20 +13,28 @@
   
 
   
+
+  
+
+  
+
   
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Pilih Server X (Konfigurasi Perangkat Grafis Anda)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-xml:id="configureX_card_list-im1" fileref="dx2-configureX_card_list.png"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX memiliki basis data perangkat video yang lengkap dan biasanya akan
 mengidentifikasi perangkat video Anda dengan benar.</para>
@@ -27,34 +42,34 @@ mengidentifikasi perangkat video Anda dengan benar.</para>
   <para>Jika installer tidak mendeteksi perangkat grafis Anda dengan benar dan Anda
 mengetahui mana yang Anda punya, Anda bisa memilihnya dari pohon dengan: <itemizedlist>
       <listitem>
-        <para>pabrikan</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>lalu nama perangkat</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>dan tipe perangkat</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
-  <para>Jika tidak menemukan perangkat Anda di daftar pabrikan (karena belum masuk
-basis data atau perangkat lawas) Anda mungkin bisa menemukan driver yang
-cocok di kategori Xorg</para>
-
-  <para>Daftaran Xorg menyediakan lebih dari 40 driver perangkat video umum dan open
-source. Jika masih tidak menemukan driver untuk perangkat Anda, masih ada
-pilihan untuk menggunakan driver vesa yang menyediakan kemampuan dasar.</para>
-
-  <para>Perhatikan bahwa jika Anda memilih driver yang tidak cocok, Anda mungkin
-hanya akan bisa mengakses Antarmuka Baris Perintah.</para>
+  <para>If you cannot find your card in the vendor lists (because it's not yet in
+the database or it's an older card) you may find a suitable driver in the
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Beberapa pabrikan perangkat video menyediakan driver proprietary untuk Linux
-yang mungkin hanya tersedia dalam repository Nonfree dan mungkin juga hanya
-tersedia di website mereka.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
-  <para>Repository Nonfree harus dihidupkan secara eksplisit untuk
-mengaksesnya. Jika Anda tidak memilih itu sebelumnya, Anda harus melakukan
-ini setelah komputer dinyalakan ulang.</para>
-</section>
\ No newline at end of file
+  <para>Some video card manufacturers provide proprietary drivers for Linux which
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/id/configureX_chooser.xml b/docs/docs/stable/installer/id/configureX_chooser.xml
index 1a2b9e39..a09011f2 100644
--- a/docs/docs/stable/installer/id/configureX_chooser.xml
+++ b/docs/docs/stable/installer/id/configureX_chooser.xml
@@ -1,64 +1,92 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="id">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Konfigurasi Perangkat Grafis dan Monitor</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata revision="1" fileref="dx2-configureX_chooser.png"
-align="center" format="PNG" xml:id="configureX_chooser-im1"> </imagedata>
-</imageobject></mediaobject>
-
-  <para revision="1" xml:id="configureX_chooser-pa1">Apapun lingkungan grafis (disebut juga lingkungan desktop) yang Anda pilih
-dalam menginstall <application>Mageia</application>, semua bersandar pada
-sistem antarmuka pengguna grafis yang disebut <acronym>Sistem Window
-X</acronym>, atau hanya <acronym>X</acronym>. Agar <acronym>KDE</acronym>,
-<acronym>Gnome</acronym>, <acronym>LXDE</acronym> atau yang lainnya bisa
-bekerja dengan baik, pengaturan <acronym>X</acronym> berikut harus
-tepat. Pilih pengaturan yang tepat jika <application>DrakX</application>
-tidak membuat pilihan, atau jika pilihan salah.</para>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
+
+  <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis><guibutton>Perangkat Grafis</guibutton></emphasis>: Pilih
-perangkat Anda dari daftar berikut jika diperlukan.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis><guibutton>Monitor</guibutton></emphasis>: Anda bisa memilih
-<guilabel>Plug'n Play</guilabel> jika bisa diterapkan, atau pilih monitor
-dari daftar <guilabel>Pabrikan</guilabel> atau
-<guilabel>Umum</guilabel>. Pilih <guilabel>Sesuaian</guilabel> jika Anda
-lebih suka untuk mengatur refresh rate monitor horisontal dan vertikal
-secara manual.</para>
-
-      <warning>
-        <para revision="1" xml:id="configureX_chooser-pa3a">Refresh rate yang tidak tepat bisa merusak monitor Anda</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis><guibutton>Resolusi</guibutton></emphasis>: Atur resolusi dan
-kedalaman warna monitor yang diinginkan di sini.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis><guibutton>Coba</guibutton></emphasis>: Tombol untuk mencoba tidak
-selalu muncul saat instalasi. Jika tombolnya ada, Anda bisa mengendalikan
-pengaturan dengan menekannya. Jika Anda melihat pertanyaan apakah pengaturan
-sudah tepat, Anda bisa menjawab "ya", dan pengaturan akan
-dipertahankan. Jika Anda tidak melihat apapun, Anda akan kembali ke layar
-konfigurasi dan bisa mengkonfigurasi ulang semua sampai hasilnya
-bagus. <emphasis>Pastikan pengaturan Anda adalah yang teraman jika tombol
-untuk mencoba tidak tersedia</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis><guibutton>Pilihan</guibutton></emphasis>: Di sini Anda bisa
-memilih untuk menghidupkan atau mematikan berbagai pilihan.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
 </section>
diff --git a/docs/docs/stable/installer/id/configureX_monitor.xml b/docs/docs/stable/installer/id/configureX_monitor.xml
index 2e97323b..cd08c01c 100644
--- a/docs/docs/stable/installer/id/configureX_monitor.xml
+++ b/docs/docs/stable/installer/id/configureX_monitor.xml
@@ -14,11 +14,17 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
-<!-- lproof -->
+<!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Pemilihan Monitor</title>
   </info>
 
@@ -26,59 +32,74 @@
 monitor Anda dengan tepat.</para>
 
   <warning>
-    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis>Memilih monitor dengan karakteristik yang berbeda bisa merusak
-monitor atau perangkat video Anda. Jangan mencoba sesuatu jika Anda tidak
-mengetahuinya.</emphasis> Jika ragu, sebaiknya Anda membaca dokumentasi
-monitor yang Anda miliki</para>
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
+could damage your monitor or video hardware. Please don't try something
+without knowing what you are doing.</emphasis> If in doubt you should
+consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
 format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa2"><emphasis>Sesuaian</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Sesuaian</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Pilihan ini memungkinkan Anda mengatur dua parameter penting, refresh rate
-vertikal dan sync rate horisontal. Refresh vertikal menentukan seberapa
-sering layar disegarkan dan sync horisontal adalah kecepatan di mana scan
-line ditampilkan.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4"><emphasis>SANGAT PENTING</emphasis> untuk tidak menentukan tipe monitor
+        <para revision="1" xml:id="configureX_monitor-pa4"><emphasis>SANGAT PENTING</emphasis> untuk tidak menentukan tipe monitor
 dengan jarak sync diluar kemampuan monitor: Anda bisa merusak monitor. Jika
 ragu, pilih pengaturan sederhana dan baca dokumentasi monitor yang Anda
 miliki.</para>
+      </listitem>
+    </varlistentry>
 
-  <para revision="1" xml:id="configureX_monitor-pa5"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para revision="1" xml:id="configureX_monitor-pa6">Ini adalah pilihan bawaan dan mencoba untuk menentukan tipe monitor dari
-basis data.</para>
-
-  <para revision="1"
-  xml:id="configureX_monitor-pa7"><emphasis>Pabrikan</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa8">Jika installer tidak mendeteksi monitor Anda dengan benar dan Anda
-mengetahui jenis monitor yang Anda miliki, Anda bisa memilihnya dari pohon
-dengan memilih: <itemizedlist>
       <listitem>
-        <para>pabrikan</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>nama pembuat monitor</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>keterangan monitor</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Jika installer tidak mendeteksi monitor Anda dengan benar dan Anda
+mengetahui jenis monitor yang Anda miliki, Anda bisa memilihnya dari pohon
+dengan memilih:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa9"><emphasis>Umum</emphasis></para>
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para revision="1" xml:id="configureX_monitor-pa10">memilih grup ini menampilkan hampir 30 konfigurasi seperti 1024x768 @ 60 Hz
-dan termasuk layar datar seperti yang digunakan pada laptop. Ini seringkali
-bagus digunakan untuk memilih monitor jika Anda menggunakan driver Vesa
-ketika perangkat video Anda tidak bisa ditentukan secara otomatis. Akan
-sangat bijaksana jika Anda memilih yang sederhana.</para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
+
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 </section>
diff --git a/docs/docs/stable/installer/id/diskPartitioning.xml b/docs/docs/stable/installer/id/diskPartitioning.xml
new file mode 100644
index 00000000..32a5d70d
--- /dev/null
+++ b/docs/docs/stable/installer/id/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="id" version="5.0" xml:lang="id">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/diskdrake.xml b/docs/docs/stable/installer/id/diskdrake.xml
index de7712c8..6b0f4b00 100644
--- a/docs/docs/stable/installer/id/diskdrake.xml
+++ b/docs/docs/stable/installer/id/diskdrake.xml
@@ -1,49 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" 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" version="5.0" xml:lang="id" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Menyesuaikan pemartisian disk dengan DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
+
   <warning>
-    <para revision="3" xml:id="diskdrake-pa1">Jika ingin menggunakan enkripsi untuk partisi <literal>/</literal> Anda,
-pastikan Anda memiliki partisi <literal>/boot</literal> terpisah. Pilihan
-enkripsi untuk partisi <literal>/boot</literal> JANGAT diatur, atau sistem
-Anda tidak akan bisa berjalan.</para>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
   </warning>
-  <para xml:id="diskdrake-pa3" revision="2">Sesuaikan layout diks Anda di sini. Anda bisa menghapus atau membuat
-partisi, mengubah sistem file partisi atau mengubah ukurannya dan bahkan
-melihat apa di dalamnya sebelum Anda memulai.</para>
-  <para xml:id="diskdrake-pa4" revision="1">Ada tab untuk setiap hard disk yang terdeteksi atau perangkat penyimpanan
-lainnya, seperti flashdisk. Contohnya sda, sdb dan sdc jika ada tiga. </para>
-  <para xml:id="diskdrake-pa5" revision="1">Tekan <guibutton>Bersihkan semua</guibutton> untuk membersihkan semua
-partisi pada perangkat penyimpanan terpilih</para>
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert
-mode</guibutton>) gives some more tools like to add a label or to choose a
-partition type. </para>
-  <para xml:id="diskdrake-pa6a" revision="1">Lanjutkan hingga Anda mengatur semua yang Anda inginkan.</para>
-  <para xml:id="diskdrake-pa7" revision="1">Klik <guibutton>Selesai</guibutton> jika sudah siap.</para>
-  <note>
-    <para>If you are installing Mageia on an UEFI system, check that an ESP (EFI
-System Partition) is present and correctly mounted on /boot/EFI (see below)</para>
-    <para><mediaobject><imageobject condition="classical"><imagedata fileref="dx2-diskdrake2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-align="center" fileref="live-diskdrake2.png"/></imageobject></mediaobject></para>
-  </note>
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
-    <mediaobject>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
+
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
+
+  <figure>
+    <title>EFI System Partition</title>
+
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
+
+  <figure>
+    <title>BIOS boot partition</title>
+
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/id/doPartitionDisks.xml b/docs/docs/stable/installer/id/doPartitionDisks.xml
index 75b308ef..e99fc4af 100644
--- a/docs/docs/stable/installer/id/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/id/doPartitionDisks.xml
@@ -1,81 +1,212 @@
-<?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:lang="id" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+
   
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
 
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Pemartisian</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
-  <para xml:id="doPartitionDisks-pa1" revision="1">Di layar ini Anda bisa melihat isi perangkat disk dan lihat solusi yang
-ditemukan pemandu pemartisian DrakX di mana
-<application>Mageia</application> akan diinstall.</para>
-  <para xml:id="doPartitionDisks-pa2" revision="1">Pilihan yang tersedia dari daftar di bawah akan beragam tergantung pada
-tampilan dan isi perangkat disk Anda.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist><listitem><para revision="1" xml:id="doPartitionDisks-pa4">Gunakan Partisi yang Tersedia</para><para xml:id="doPartitionDisks-pa5" revision="1">Jika pilihan ini tersedia, artinya partisi yang cocok untuk Linux telah
-ditemukan dan mungkin bisa digunakan untuk instalasi.</para></listitem><listitem><para xml:id="doPartitionDisks-pa6" revision="1">Gunakan Ruang Kosong</para><para xml:id="doPartitionDisks-pa7" revision="1">Jika Anda memiliki ruang tak terpakai pada perangkat disk Anda, maka pilihan
-ini akan menggunakannya untuk menginstall Mageia.</para></listitem><listitem><para xml:id="doPartitionDisks-pa8" revision="1">Gunakan Ruang Kosong pada Partisi Windows</para><para xml:id="doPartitionDisks-pa9" revision="1">Jika Anda memiliki ruang tak terpakai pada partisi Windows yang ada,
-installer akan menawarkan untuk menggunakannya.</para><para xml:id="doPartitionDisks-pa10" revision="2">Ini cara yang berguna untuk membuat ruang untuk instalasi Mageia, tapi
-beresiko sehingga Anda harus membuat cadangan file penting Anda!</para><para revision="3" xml:id="doPartitionDisks-pa11">Perhatikan bahwa ini akan mengurangi ukuran dari partisi Windows. Partisi
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa5">Jika pilihan ini tersedia, artinya partisi yang cocok untuk Linux telah
+ditemukan dan mungkin bisa digunakan untuk instalasi.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa7">Jika Anda memiliki ruang tak terpakai pada perangkat disk Anda, maka pilihan
+ini akan menggunakannya untuk menginstall Mageia.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
+
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
+
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">Perhatikan bahwa ini akan mengurangi ukuran dari partisi Windows. Partisi
 harus "bersih", maksudnya, Windows harus dimatikan dengan benar saat
 terakhir kali digunakan. Juga harus sudah didefrag, walaupun tidak ada
 jaminan bahwa semua file telah dipindahkan dari area yang akan
-digunakan. Sangat disarankan untuk membuat cadangan semua file pribadi.</para><para>Dengan opsi ini, installer menampilkan partisi Windows yang tersisa dalam
-warna biru cerah dan partisi Mageia nantinya dalam warna biru gelap dengan
-ukuran yang diharapkan tepat di bawahnya. Anda memiliki kemungkinan untuk
-menyesuaikan ukuran ini dengan mengklik dan menyeret pada jarak di antara
-kedua partisi. Lihat gambar di bawah.</para><mediaobject><imageobject condition="classical"><imagedata
-fileref="dx2-doPartitionDisks2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-fileref="live-doPartitionDisks2.png" align="center"/></imageobject></mediaobject></listitem></itemizedlist> <itemizedlist><listitem><para xml:id="doPartitionDisks-pa12" revision="1">Hapus dan gunakan Seluruh Disk.</para><para xml:id="doPartitionDisks-pa13" revision="1">Pilihan ini akan menggunakan seluruh perangkat untuk Mageia.</para><para xml:id="doPartitionDisks-pa14" revision="1">Perhatikan! Ini akan menghapus SEMUA data pada harddisk yang
-dipilih. Hati-hati!</para><para xml:id="doPartitionDisks-pa15" revision="1">Jika Anda bermaksud untuk menggunakan sebagian dari disk untuk yang lain,
-atau Anda memiliki data pada perangkat yang tidak boleh hilang, jangan
-gunakan pilihan ini.</para></listitem></itemizedlist><itemizedlist><listitem><para xml:id="doPartitionDisks-pa16" revision="1">Custom disk partitioning</para><para xml:id="doPartitionDisks-pa17" revision="1">Ini memberi Anda kendali penuh untuk menempatkan instalasi pada harddisk.</para></listitem></itemizedlist></para>
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
-  <para>The installer will share the available place out according to the following
-rules:</para>
-  <para><itemizedlist><listitem><para>If the total available place is lower than 50 GB, only one partition is
-created for /, there is no separate partition for /home.</para></listitem><listitem><para>If the total available place is over 50 GB, then three partitions are
-created</para><itemizedlist><listitem><para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para></listitem><listitem><para>1/19 is allocated to swap with a maximum of 4 GB</para></listitem><listitem><para>the rest (at least 12/19) is allocated to /home</para></listitem></itemizedlist></listitem></itemizedlist></para>
-  <para>That means that from 160 GB and over of available place, the installer will
-create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.</para>
+digunakan. Sangat disarankan untuk membuat cadangan semua file pribadi.</para>
+      </important>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa17">Ini memberi Anda kendali penuh untuk menempatkan instalasi pada harddisk.</para>
+    </listitem>
+  </itemizedlist>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
+
   <note>
-    <para>If you are using an UEFI system, the ESP (EFI System Partition) will be
-automatically detected, or created if it does not exist yet, and mounted on
-/boot/EFI. The "Custom disk partitioning" option is the only one that allows
-to check it has been correctly done</para>
+    <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
-  <note>
-    <para>If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk,
-you need to create a Bios boot partition if not already existing. It is an
-about 1 MiB partition with no mount point. Choose <xref
-linkend="diskdrake"/> to be able to create it with the Installer like any
-other partition, just select BIOS boot partition as filesystem type.</para>
-    <mediaobject>
+
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
-  <warning>
-    <para>Beberapa perangkat baru sekarang menggunakan sektor logis 4096 bit, daripada
-standar sebelumnya 512 bit. Karena keterbatasan hardware, alat pemartisian
-yang digunakan pada installer belum teruji pada perangkat tersebut. Beberapa
-perangkat ssd juga menggunakan ukuran blok penghapusan melebihi 1
-MB. Disarankan untuk melakukan pemartisian awal menggunakan alat pemartisian
-alternatif seperti gparted jika Anda memilikinya, dan menggunakan pengaturan
-berikut:</para>
-    <para>"Selaraskan ke" "MiB"</para>
-    <para>"Ruang kosong di awal (MiB)" "2"</para>
-    <para>Juga pastikan semua partisi dibuat dengan penomoran megabite.</para>
-  </warning>
-</section>
\ No newline at end of file
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
+
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+
+  <important>
+    <para>Some newer drives are now using 4096 byte logical sectors, instead of the
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Also make sure all partitions are created using an even number of megabytes.</para>
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/id/exitInstall.xml b/docs/docs/stable/installer/id/exitInstall.xml
index 18b5e52f..b138476a 100644
--- a/docs/docs/stable/installer/id/exitInstall.xml
+++ b/docs/docs/stable/installer/id/exitInstall.xml
@@ -1,20 +1,32 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xml:id="exitInstall" version="5.0" xml:lang="id">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0" xml:lang="id">
   <info>
     <title xml:id="exitInstall-ti1">Selamat</title>
   </info>
+
   
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
-  <para xml:id="exitInstall-pa1" revision="2">Anda telah selesai menginstall dan mengkonfigurasi
-<application>Mageia</application> dan sekarang Anda bisa mengeluarkan media
-instalasi dan menjalankan ulang komputer.</para>
-  <para xml:id="exitInstall-pa2" revision="2">Setelah komputer dijalankan ulang, pada layar bootloader, Anda bisa memilih
-sistem operasi pada komputer Anda (jika ada lebih dari satu).</para>
+
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
+
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
+
   <para xml:id="exitInstall-pa3" revision="1">Jika Anda tidak menyesuaikan pengaturan bootloader, instalasi Mageia akan
 otomatis terpilih dan dijalankan.</para>
+
   <para xml:id="exitInstall-pa4" revision="1">Nikmatilah!</para>
-  <para xml:id="exitInstall-pa5" revision="1">Kunjungi www.mageia.org jika Anda memiliki pertanyaan atau ingin
-berkontribusi untuk Mageia</para>
+
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/firewall.xml b/docs/docs/stable/installer/id/firewall.xml
index 8387e6c2..a6130645 100644
--- a/docs/docs/stable/installer/id/firewall.xml
+++ b/docs/docs/stable/installer/id/firewall.xml
@@ -1,33 +1,37 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="id">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="id" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Firewall</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Firewall</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows to configure some simple firewall rules: they determine
-which type of message from the Internet will be accepted by the target
-system. This, in turn, allows the corresponding services on the system to be
-accessible from the Internet.</para>
+  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+determine which type of message from the Internet will be accepted by the
+target system. This, in turn, allows the corresponding services on the
+system to be accessible from the Internet.</para>
 
-  <para>In the default setting, no button is checked - no service of the system is
-accessibly from the network. The "<emphasis>Everything (no
-firewall)</emphasis>" button has a particular role: it enables access to all
-services of the machine - an option that does not make much sense in the
-context of the installer since it would create a totally unprotected
-system.  Its veritable use is in the context of the Mageia Control Center
-(which uses the same GUI layout) for temporarily disabling the entire set of
-firewall rules for testing and debugging purposes.</para>
+  <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
 
-  <para>All other checkbuttons are more or less self-explanatory. As an example, you
-will check the "CUPS server" button if you want printers on your machine to
-be accessible from the network.</para>
+  <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The set of checkbuttons only comprises the most common services. The
-"Advanced" button allows to enable messages that correspond to a service for
-which no checkbutton exists. The "<emphasis>Advanced</emphasis>" button
-opens a window where you can enable a series of services by typing a list of
-couples (blank separated)</para>
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
 
diff --git a/docs/docs/stable/installer/id/formatPartitions.xml b/docs/docs/stable/installer/id/formatPartitions.xml
index e73477ed..3c08634d 100644
--- a/docs/docs/stable/installer/id/formatPartitions.xml
+++ b/docs/docs/stable/installer/id/formatPartitions.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="formatPartitions">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Pemformatan</title>
   </info>
@@ -7,42 +13,41 @@
   
 
   
+
   
+
   
+
   
-  
-  
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-formatPartitions.png" format="PNG" align="center"
-xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-formatPartitions.png" format="PNG" align="center"
-xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="formatPartitions-pa1">Di sini Anda bisa memilih partisi mana yang ingin Anda format. Semua data
-pada partisi yang <emphasis>tidak</emphasis> ditandai untuk diformat akan
-tetap tersimpan.</para>
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
+partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa2">Biasanya, setidaknya partisi yang dipilih oleh DrakX perlu diformat</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa3">Klik pada <guibutton>Lanjutan</guibutton> untuk memilih partisi yang ingin
-Anda periksa dari yang disebut <emphasis>blok rusak</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para revision="1" xml:id="formatPartitions-pa4">Jika Anda tidak yakin telah membuat pilihan yang benar, Anda bisa mengklik
-<guibutton>Sebelumnya</guibutton>, lalu <guibutton>Sebelumnya</guibutton>
-lagi, lalu <guibutton>Sesuaian</guibutton> untuk kembali ke layar utama.
-Pada layar tersebut, Anda bisa memilih untuk melihat apa yang ada dalam
-partisi Anda.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para revision="1" xml:id="formatPartitions-pa5">Jika Anda cukup yakin dengan pilihan Anda, klik pada
-<guibutton>Selanjutnya</guibutton> untuk melanjutkan.</para>
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
 </section>
diff --git a/docs/docs/stable/installer/id/graphicalConfiguration.xml b/docs/docs/stable/installer/id/graphicalConfiguration.xml
new file mode 100644
index 00000000..77e0e74b
--- /dev/null
+++ b/docs/docs/stable/installer/id/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/id/installUpdates.xml b/docs/docs/stable/installer/id/installUpdates.xml
index 2196fae1..c31f76c1 100644
--- a/docs/docs/stable/installer/id/installUpdates.xml
+++ b/docs/docs/stable/installer/id/installUpdates.xml
@@ -1,31 +1,46 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="id">
+  
 
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="installUpdates"><info><title xml:id="installUpdates-ti1">Update</title></info>
+  
 
+  
 
+  
 
+  
 
- 
- 
- 
+  
 
-   <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-installUpdates.png"
-format="PNG" align="center" xml:id="installUpdates-im1"></imagedata>
-</imageobject></mediaobject> 
-
- <para revision="1" xml:id="installUpdates-pa1">Mulai sejak dirilis <application>Mageia</application> versi ini, beberapa
-paket akan terus diupdate atau ditingkatkan.</para>
-
-  <para revision="1" xml:id="installUpdates-pa2">Pilih <guilabel>ya</guilabel> jika Anda ingin mendownload dan
-menginstallnya, pilih <guilabel>tidak</guilabel> jika tidak ingin
-melakukannya sekarang, atau jika Anda tidak terhubung ke internet</para>
-
-  <para revision="1" xml:id="installUpdates-pa3">Lalu tekan <guibutton>Selanjutnya</guibutton> untuk melanjutkan</para>
-
-</section>
-  
\ No newline at end of file
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Update</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
+align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+    </listitem>
+
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/installer.xml b/docs/docs/stable/installer/id/installer.xml
index 1006c5a6..601aa2ca 100644
--- a/docs/docs/stable/installer/id/installer.xml
+++ b/docs/docs/stable/installer/id/installer.xml
@@ -1,167 +1,169 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="installer">
-  <info>
-    <title xml:id="Select-and-use-ISOs-ti1">DrakX, Installer Mageia</title>
-  </info>
-
-  <para>Tidak peduli Anda baru mengenal GNU-Linux atau yang telah berpengalaman,
-Installer Mageia dibuat untuk membantu instalasi atau upgrade semudah
-mungkin.</para>
-
-  <para>Layar menu awal memiliki berbagai pilihan, akan tetapi bawaannya akan
-memulai installer, yang normalnya adalah yang Anda inginkan.</para>
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="installer"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
 
-  <section>
-    <title>Layar Selamat Datang untuk Instalasi</title>
+  
 
-    <section>
-      <title>Using a Mageia DVD</title>
+  
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-with an UEFI system and the second one with a Legacy system:</para>
+  
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, you can access to options by pressing the "e" letter to
-enter the "edit mode". To come back to this screen, press either the key
-"esc" to quit without saving or press the key "Ctrl" or "F10" to quit with
-saving.</para>
-
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
+  
 
-      <para>From this screen, it is possible to set some personal preferences:<itemizedlist>
-          <listitem>
-            <para>Bahasa (untuk instalasi saja, mungkin berbeda dengan bahasa yang dipilih
-untuk sistem) dengan menekan tombol F2 (hanya mode Legacy)</para>
+  
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
+  
 
-            <para>Gunakan tombol panah untuk memilih bahasa, lalu tekan tombol Enter.</para>
+  
 
-            <para>Seperti ini contohnya, layar sambutan bahasa Perancis ketika menggunakan
-Live DVD/CD. Ingat bahwa menu Live DVD/CD tidak disodorkan: <guilabel>Sistem
-Penyelamat</guilabel>, <guilabel>Pengujian memori</guilabel> dan
-<guilabel>Peralatan Pendeteksian Perangkat Keras</guilabel>.</para>
+  
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome4fr.png"/> </imageobject></mediaobject>
-          </listitem>
+  
 
-          <listitem>
-            <para>Ubah resolusi layar dengan menekan tombol F3 (hanya mode Legacy).</para>
+  <info>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, Installer Mageia</title>
+  </info>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
+  <para>Tidak peduli Anda baru mengenal GNU-Linux atau yang telah berpengalaman,
+Installer Mageia dibuat untuk membantu instalasi atau upgrade semudah
+mungkin.</para>
 
-          <listitem>
-            <para>Tambahkan beberapa opsi kernel dengan menekan tombol <emphasis
-role="bold">F6</emphasis> untuk mode legacy atau tombol <emphasis
-role="bold">e</emphasis> untuk mode UEFI.</para>
+  <section>
+    <title>Langkah-langkah instalasi</title>
 
-            <para>Jika instalasi gagal, mungkin penting untuk mencoba kembali menggunakan
-salah satu opsi tambahan. Menu yang dipanggil dengan F6 menampilkan baris
-baru yang disebut <guilabel>Opsi boot</guilabel> dan menawarkan empat entri:</para>
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
-            <para>- Baku, dia tidak mengubah apapun dalam opsi baku.</para>
+  <section>
+    <title>Layar Selamat Datang untuk Instalasi</title>
 
-            <para>- Baku, dia tidak mengubah apapun dalam opsi baku.</para>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-            <para>- Tanpa ACPI (Advanced Configuration and Power Interface), manajemen daya
-tidak diterapkan.</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
 
-            <para>- Tanpa APIC Lokal (Local Advanced Programmable Interrupt Controller), ini
-untuk interupsi CPU, pilih opsi ini jika diminta.</para>
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
-            <para>Ketika Anda memilih salah satu entri ini, dia akan mengubah opsi baku yang
-ditampilkan pada <guilabel>Opsi Boot</guilabel>.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-            <note>
-              <para>Pada beberapa rilis Mageia, mungkin entri yang dipilih dengan tombol F6
-tidak muncul pada baris <guilabel>Opsi Boot</guilabel>, tetapi, sebenarnya
-mereka telah diterapkan.</para>
-            </note>
+      <itemizedlist>
+        <title>Menu</title>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
 
-          <listitem>
-            <para>Tambahkan lebih banyak opsi kernel dengan menekan tombol F1 (hanya mode
-Legacy).</para>
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
 
-            <para>Pressing F1 opens a new window with more available options.  Select one with
-the arrow keys and press Enter to have more details or press the Esc key to
-go back to the welcome screen.</para>
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
 
-            <para>Tampilan detil tentang pilihan splash. Tekan Esc atau pilih
-<guilabel>Kembali ke Opsi Boot</guilabel> untuk kembali ke daftar
-pilihan. Pilihan ini bisa ditambahkan secara manual di baris <guilabel>Opsi
-boot</guilabel>.</para>
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
 
-            <note>
-              <para>Bantuan diterjemahkan ke dalam bahasa yang dipilih dengan tombol F2.</para>
-            </note>
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
 
-            <para>Untuk informasi lebih banyak tentang opsi kernel pada sistem legacy dan
-UEFI, lihat: <link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
 
     <section>
-      <title>Using a Wired Network</title>
+      <title>UEFI Systems</title>
 
-      <para>Here is the default welcome screen when using a Wired Network-based
-Installation CD (netinstall.iso or netinstall-nonfree.iso images):</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-      <para>Ini tidak memungkinkan untuk mengubah bahasa, pilihan yang tersedia
-dijelaskan pada layar. Untuk informasi tentang menggunakan CD Instalasi
-Jaringan Kabel, lihat <link
-ns2:href="https://wiki.mageia.org/en/Boot.iso_install">Wiki Mageia</link></para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-      <warning>
-        <para>Layout keyboard adalah layout Amerika.</para>
-      </warning>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="../dx-help.png"/> </imageobject></mediaobject>
-    </section>
-  </section>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
 
-  <section>
-    <title>Langkah-langkah instalasi</title>
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
 
-    <para>Proses instalasi terbagi ke dalam beberapa langkah, yang bisa diikuti pada
-panel samping dari layar.</para>
-
-    <para>Setiap langkah memiliki satu layar atau lebih yang mungkin juga memiliki
-tombol <guibutton>Lanjutan</guibutton> dengan pilihan tambahan yang tidak
-terlalu dibutuhkan.</para>
-
-    <para>Kebanyakan layar memiliki tombol <guibutton>Bantuan</guibutton> yang memberi
-penjelasan lebih tentang langkah yang sedang dijalani.</para>
-
-    <note>
-      <para>Jika di manapun saat menginstall Anda memutuskan untuk menghentikan
-instalasi, komputer bisa dijalankan ulang, tapi harap dipikir dua kali
-sebelum melakukannya.  Setelah partisi diformat atau update telah dijalankan
-atau diinstall, komputer Anda sudah tidak lagi dalam kondisi yang sama dan
-menjalankan ulang komputer bisa membuat sistem komputer Anda tidak
-stabil. Jika Anda benar-benar ingin menjalankan ulang komputer, jalankan
-terminal teks dengan menekan tiga tombol <guibutton>Alt Ctrl F2</guibutton>
-secara bersamaan. Setelahnya, tekan <guibutton>Alt Ctrl Delete</guibutton>
-secara bersamaan untuk menjalankan ulang.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -172,18 +174,20 @@ secara bersamaan untuk menjalankan ulang.</para>
 
       <itemizedlist>
         <listitem>
-          <para>Setelah layar awal, Anda tidak pernah sampai pada layar pemilihan
-bahasa. Ini bisa terjadi dengan beberapa perangkat grafis dan komputer
-lama. Coba menggunakan resolusi yang lebih rendah dengan mengetikkan
-<code>vgalo</code> pada baris perintah.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
-          <para>Jika perangkat keras sudah tua, instalasi grafis mungkin tidak bisa. Jika
-demikian, akan lebih baik untuk mencoba instalasi dengan mode teks. Untuk
-menggunakannya, tekan ESC pada layar sambutan pertama, lalu konfirmasi
-dengan ENTER. Anda akan diberikan layar hitam dengan kata "boot:". Ketik
-"text" lalu tekan ENTER. Lalu lanjutkan dengan instalasi dalam mode teks.</para>
+          <para>If the hardware is very old, a graphical installation may not be
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -191,32 +195,31 @@ dengan ENTER. Anda akan diberikan layar hitam dengan kata "boot:". Ketik
     <section>
       <title>Instalasi Membeku</title>
 
-      <para>Jika sistem membeku saat instalasi, mungkin ada masalah dengan pendeteksian
-hardware. Pada kasus seperti ini, pendeteksian otomatis mungkin perlu
-dilewati untuk ditangani kemudian. Untuk mencobanya, ketik
-<code>noauto</code> pada baris perintah. Pilihan ini juga bisa
-dikombinasikan dengan pilihan lain seperlunya.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
       <title>Masalah RAM</title>
 
-      <para>Ini jarang diperlukan, tapi dalam beberapa kasus, hardware menginformasikan
-RAM yang tersedia tidak benar. Untuk menentukan ini secara manual, Anda bisa
-menggunakan parameter <code>mem=xxxM</code>, di mana xxx adalah besar RAM
-yang benar. Misalnya <code>mem=256M</code> untuk menentukan RAM 256MB.</para>
+      <para>This will rarely be needed, but in some cases the hardware may report the
+available RAM incorrectly. To specify this manually, you can use the
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Partisi dinamis</title>
 
-      <para>Jika Anda mengubah harddisk dari format "basic" ke format "dynamic" pada
-Microsoft Windows, Anda harus tahu bahwa tidak mungkin menginstall Mageia
-pada disk tersebut. Untuk kembali ke disk basic, lihat dokumentasi
-Microsoft: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
-
-  <section/>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/id/locale.xml b/docs/docs/stable/installer/id/locale.xml
new file mode 100644
index 00000000..0666e707
--- /dev/null
+++ b/docs/docs/stable/installer/id/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/id/login.xml b/docs/docs/stable/installer/id/login.xml
index a7e60cea..fe9615f7 100644
--- a/docs/docs/stable/installer/id/login.xml
+++ b/docs/docs/stable/installer/id/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="id"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
-yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para><para>Informasi lebih lengkap ada di <link
-ns4:href="https://wiki.mageia.org/en/Category:Documentation">wiki
-Mageia</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="id">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/media_selection.xml b/docs/docs/stable/installer/id/media_selection.xml
index 559e5b43..0ac9dc8f 100644
--- a/docs/docs/stable/installer/id/media_selection.xml
+++ b/docs/docs/stable/installer/id/media_selection.xml
@@ -1,18 +1,31 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="id">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Pemilihan Media (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
+
   
+
   
+
   
 
-<mediaobject>
+  
+  
+  <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
 <imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
 format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
@@ -28,20 +41,19 @@ dasar dari distribusi.</para>
     </listitem>
 
     <listitem>
-      <para>Repository <emphasis>Nonfree</emphasis> menyediakan paket-paket yang gratis,
-misalnya Mageia mungkin menyediakannya, tapi mungkin berisi software dengan
-sumber tertutup (karenanya dinamakan - Nonfree). Sebagai contoh, repository
-ini menyediakan driver proprietary untuk perangkat grafis nVidia dan ATI,
-firmware untuk berbagai perangkat WiFi, dsb.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
-      <para>Repository <emphasis>Tainted</emphasis> menyertakan paket-paket yang
-dikeluarkan di bawah lisensi bebas. Kriteria utama menempatkan paket-paket
-ke dalam repository ini adalah karena paket-paket ini mungkin akan melanggar
-hak cipta dan hak paten di beberapa negara, misalnya codec Multimedia yang
-diperlukan untuk memainkan beragam file audio/video; paket-paket yang
-diperlukan untuk memainkan video DVD komersial, dsb.</para>
+      <para>The <emphasis>Tainted</emphasis> repository includes packages released under
+a free license. The main criteria for placing packages in this repository is
+that they may infringe patents and copyright laws in some countries,
+e.g. multimedia codecs needed to play various audio/video files; packages
+needed to play commercial video DVD's, etc.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/id/minimal-install.xml b/docs/docs/stable/installer/id/minimal-install.xml
index f0fa086e..c11efb37 100644
--- a/docs/docs/stable/installer/id/minimal-install.xml
+++ b/docs/docs/stable/installer/id/minimal-install.xml
@@ -1,47 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="id" xml:id="minimal-install"
-         xmlns="http://docbook.org/ns/docbook"
-	 xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="id">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Instalasi Minimal</title>
   </info>
 
   
+
+  
+
+  
+
+  
+
   
 
-  <para>Anda bisa memilih Instalasi Minimal dengan tidak memilih semua pada layar
-Pemilihan Grup Paket, lihat <xref linkend="choosePackageGroups"></xref>.</para>
-  <para>If desired, you can additionally tick the "Individual package selection"
-option in the same screen.</para>
   <para>Minimal Installation is intended for those with specific uses in mind for
-their <application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the "Individual
-package selection" option mentioned above, to fine-tune your installation,
-see <xref linkend="choosePackagesTree"></xref>.</para>
-  <para>Jika Anda memilih instalasi ini, maka layar yang berhubungan akan menawarkan
-Anda sedikit tambahan untuk diinstall, seperti dokumentasi dan X.</para>
-  <para>If selected, "With X" will also include IceWM as lightweight desktop
-environment.</para>
-  <para>The basic documentation is provided in the form of man and info pages.  It
-contains the man pages from the <link
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
 Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
 coreutils</link> info pages.</para>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" fileref="dx2-minimal-install.png"
-align="center" format="PNG" xml:id="minimal-install-im1"></imagedata>
+<imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
+align="center" fileref="dx2-minimal-install.png" revision="1"/>
 </imageobject></mediaobject>
-
-  </section>
-
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/misc-params.xml b/docs/docs/stable/installer/id/misc-params.xml
index a438155c..cc49510b 100644
--- a/docs/docs/stable/installer/id/misc-params.xml
+++ b/docs/docs/stable/installer/id/misc-params.xml
@@ -1,22 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Ringkasan dari berbagai parameter</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
-
-  <para xml:id="misc-params-pa1" revision="1">DrakX membuat pilihan pintar untuk konfigurasi sistem Anda tergantung pada
-pilihan yang telah Anda buat dan pada hardware yang terdeteksi oleh
-DrakX. Anda bisa memeriksanya di sini dan mengubahnya jika Anda mau setelah
-menekan <guibutton>Konfigurasi</guibutton>.</para>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+  <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
 
   <note>
-    <para>As a general rule, default settings are recommended and you can keep them
-with 3 exceptions:<itemizedlist>
+    <para>As a general rule, it is recommended that you accept the default settings
+unless:<itemizedlist>
         <listitem>
           <para>there are known issues with a default setting</para>
         </listitem>
@@ -26,7 +42,7 @@ with 3 exceptions:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>something else is said in the detailed sections below</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,47 +54,47 @@ with 3 exceptions:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Zona Waktu</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX memilih zona waktu tergantung pada bahasa yang Anda pilih. Anda bisa
-mengubahnya jika perlu. Lihat juga <xref linkend="configureTimezoneUTC"/></para>
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Negara / Wilayah</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
-        <para xml:id="misc-params-system-pa3a" revision="1">Jika Anda tidak berada pada negara terpilih, sangat penting untuk
-memperbaiki pengaturan. Lihat <xref linkend="selectCountry"/></para>
+        <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
+setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Bootloader</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX telah membuat pilihan yang bagus untuk pengaturan bootloader.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure Grub2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Untuk informasi lebih, lihat <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Pengelolaan pengguna</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Anda bisa menambah pengguna tambahan di sini. Mereka akan mendapatkan
-direktori <literal>/home</literal> masing-masing.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Layanan</guilabel>:</para>
-
-        <para xml:id="misc-params-system-pa6a" revision="1">Layanan sistem yang mengacu pada program kecil yang berjalan di belakang
-layar (daemon). Alat ini memungkinkan Anda untuk menghidupkan atau mematikan
-tugas-tugas tertentu.</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Anda harus memeriksa dengan hati-hati sebelum mengubah apapun di sini -
-sebuah kesalahan bisa menghalangi komputer untuk berjalan dengan semestinya.</para>
+        <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
+(daemons).  This tool allows you to enable or disable certain processes.</para>
 
-        <para>Untuk informasi lebih, lihat <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -90,10 +106,10 @@ sebuah kesalahan bisa menghalangi komputer untuk berjalan dengan semestinya.</pa
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Keyboard</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa1a" revision="1">Ini adalah tempat Anda bisa mengatur atau mengubah layout keyboard yang akan
-tergantung pada lokasi, bahasa atau tipe keyboard Anda.</para>
+        <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
+of keyboard.</para>
 
         <note>
           <para>If you notice a wrong keyboard layout and want to change it, keep in mind
@@ -102,27 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Mouse</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Di sini Anda bisa menambah atau mengkonfigurasi perangkat penunjuk lainnya,
 tablet, trackball, dsb.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Perangkat suara</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">Installer menggunakan driver baku, jika ada. Opsi untuk memilih driver
-berbeda hanya diberikan ketika ada lebih dari satu driver untuk perangkat
-Anda, tapi tidak satupun merupakan pilihan baku.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Antarmuka grafis</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Bagian ini memungkinkan Anda mengkonfigurasi perangkat grafis dan tampilan.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Untuk informasi lebih, lebih <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -137,28 +158,28 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Jaringan</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
-        <para xml:id="misc-params-network-pa2" revision="1">Anda bisa mengkonfigurasi jaringan di sini, tapi untuk perangkat jaringan
-dengan driver non-free akan lebih baik jika dilakukan setelah menjalankan
-ulang komputer, di <application>Pusat Kendali Mageia</application>, jika
-Anda belum menghidupkan reporitory media Nonfree.</para>
+        <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
+repositories.</para>
 
         <warning>
-          <para xml:id="misc-params-network-pa3" revision="1">Jika Anda menambahkan perangkat jaringan, jangan lupa untuk mengatur
-firewall untuk melihat antarmuka jaringan tersebut.</para>
+          <para xml:id="misc-params-network-pa3" revision="1">When you add a network card, do not forget to set your firewall to monitor
+that interface as well.</para>
         </warning>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxy</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">Server Proxy berfungsi sebagai perantara antara komputer Anda dengan
-internet yang lebih luas. Bagian ini memungkinkan Anda mengkonfigurasi
-komputer untuk memanfaatkan layanan proxy.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">Anda mungkin perlu bertanya pada administrator sistem untuk mendapatkan
-parameter yang diperlukan untuk dimasukkan di sini</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -170,26 +191,31 @@ parameter yang diperlukan untuk dimasukkan di sini</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Tingkat Keamanan</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Di sini Anda mengatur tingkat keamanan komputer, biasanya pengaturan bawaan
-(Standar) adalah yang paling memadai untuk penggunaan umum.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Lihat pilihan yang sesuai dengan penggunaan komputer Anda.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Firewall</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">Firewall dimaksudkan untuk menjadi pembatas antara data penting Anda dengan
-para penjahat di internet yang bermaksud untuk membahayakan atau mencurinya.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Ingat bahwa membiarkan semua (tanpa firewall) akan sangat beresiko.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/id/reboot.xml b/docs/docs/stable/installer/id/reboot.xml
index d5bdf55c..eaf01813 100644
--- a/docs/docs/stable/installer/id/reboot.xml
+++ b/docs/docs/stable/installer/id/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="id" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Boot Ulang</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/id/securityLevel.xml b/docs/docs/stable/installer/id/securityLevel.xml
index b0497da5..cc8be5ba 100644
--- a/docs/docs/stable/installer/id/securityLevel.xml
+++ b/docs/docs/stable/installer/id/securityLevel.xml
@@ -1,33 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="securityLevel" version="5.0" xml:lang="id">
+<section version="5.0" xml:lang="id" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="securityLevel-ti1">Tingkat Keamanan</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="securityLevel-ti1">Tingkat Keamanan</title>
-    </info>
+  
 
- 
- 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-securityLevel.png"
-align="center" format="PNG" xml:id="securityLevel-im1"></imagedata>
-</imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
-    <para revision="1" xml:id="securityLevel-pa1">Anda bisa mengatur penyesuaian tingkat keamanan di sini.</para>
+  <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-    <para revision="1" xml:id="securityLevel-pa2">Biarkan tetap pada pengaturan bawaan jika Anda tidak mengerti apa yang harus
-dipilih.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
 
-    <para revision="2" xml:id="securityLevel-pa3">Setelah instalasi, mengatur penyesuaian keamanan tetap bisa dilakukan di
-bagian <guilabel>Keamanan</guilabel> pada Pusat Kendali Mageia.</para>
-  </section>
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
+  <para><emphasis role="bold">Security Administrator</emphasis></para>
+
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
+send <emphasis>security alert messages</emphasis> when it detects situations
+which require notification to a system administrator.</para>
+
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
+
+  <note>
+    <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
+messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
+be configured for receiving such mail!</para>
+  </note>
+
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/id/selectCountry.xml b/docs/docs/stable/installer/id/selectCountry.xml
index 705bcdf9..3107d68e 100644
--- a/docs/docs/stable/installer/id/selectCountry.xml
+++ b/docs/docs/stable/installer/id/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="id">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="id">
   <info>
     <title xml:id="selectCountry-ti1">Pilih Negara / Wilayah Anda</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">Jika negara Anda tidak ada di dalam daftar, klik tombol <guilabel>Negara
-Lainnya</guilabel> lalu pilih negara / wilayah Anda di sana.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">Jika negara Anda hanya dalam daftar <guilabel>Negara Lainnya</guilabel>,
-setelah mengklik <guibutton>OK</guibutton> mungkin sebuah negara dari daftar
-pertama telah terpilih. Abaikan saja, DrakX akan mengikuti pilihan Anda yang
-sebenarnya.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,18 +40,19 @@ sebenarnya.</para>
       <title xml:id="inputMethod-ti7">Metode masukan</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
-manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar
+manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
 functions and can be installed if you added HTTP/FTP media before package
 selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via "Configure your Computer" ->
-"System", or by running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/selectInstallClass.xml b/docs/docs/stable/installer/id/selectInstallClass.xml
index 65ba24df..81d5770b 100644
--- a/docs/docs/stable/installer/id/selectInstallClass.xml
+++ b/docs/docs/stable/installer/id/selectInstallClass.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- 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="id" xml:id="selectInstallClass">
+<section version="5.0" xml:lang="id" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
 
   
 
@@ -14,6 +15,13 @@
   
 
   
+
+  
+
+  
+
+  
+
   
 
   <info>
@@ -23,53 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Install atau Upgrade</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectInstallClass.png" align="center"
-format="PNG"></imagedata> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Install</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Gunakan pilihan ini untuk instalasi <application>Mageia</application> baru.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Upgrade</para>
-
-      <para>Jika Anda memilihi satu atau lebih instalasi
-<application>Mageia</application> pada sistem, installer akan memberi
-pilihan untuk upgrade salah satunya.</para>
-
-<warning>
-	<para>Hanya upgrade dari versi Mageia yang <emphasis>masih didukung</emphasis>
-saat versi installer ini dirilis, yang telah sepenuhnya diuji. Jika Anda
-ingin melakukan upgrade versi Mageia yang telah mencapai akhir	dukungan
-ketika yang ini dirilis, akan lebih baik untuk melakukan instalasi baru dan
-membiarkan partisi <literal>/home</literal> Anda.</para>
-</warning>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
+
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>Jika selama instalasi Anda memutuskan untuk menghentikannya, Anda bisa
-menjalankan ulang komputer, tapi pikir dua kali sebelum
-melakukannya. Setelah partisi diformat atau update telah mulai diinstall,
-kondisi komputer Anda sudah tidak sama lagi dan menjalankan ulang komputer
-bisa membuat komputer Anda tidak bisa digunakan lagi. Jika Anda benar-benar
-ingin menjalankan ulang komputer, jalankan terminal dengan menekan tiga
-tombol <guilabel>Alt Ctrl F2</guilabel> secara bersamaan. Lalu tekan
-<guilabel>Alt Ctrl Delete</guilabel> secara bersamaan untuk menjalankan
-ulang.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
-    <para>Jika Anda terlupa untuk memilih bahasa tambahan, Anda bisa kembali dari
-layar "Install atau Upgrade" ke layar pemilihan bahasa dengan menekan
-<guilabel>Alt Ctrl Home</guilabel>. <emphasis>Jangan</emphasis> melakukan
-ini saat sedang menginstall.</para>
+    <para>If you have discovered that you forgot to select an additional language, you
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
 </section>
diff --git a/docs/docs/stable/installer/id/selectKeyboard.xml b/docs/docs/stable/installer/id/selectKeyboard.xml
index b8524000..37078d32 100644
--- a/docs/docs/stable/installer/id/selectKeyboard.xml
+++ b/docs/docs/stable/installer/id/selectKeyboard.xml
@@ -10,9 +10,18 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Keyboard</title>
   </info>
 
@@ -20,7 +29,7 @@
 yang cocok maka layout keyboard US akan digunakan.</para>
 
   <mediaobject>
-<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png" />
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
@@ -33,23 +42,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="selectKeyboard-pa3">Jika keyboard Anda tidak ada di daftar yang ditampilkan, klik pada
-<guibutton>Lainnya</guibutton> untuk mendapatkan daftar lengkap, lalu pilih
-keyboard Anda di sana.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">Setelah memilih keyboard dari dialog <guibutton>Lainnya</guibutton>, Anda
-akan kembali ke dialog pilihan keyboard pertama dan walaupun sepertinya
-sebuah keyboard pada layar tersebut terpilih. Anda bisa mengabaikannya dan
-melanjutkan instalasi: Keyboar Anda adalah yang dipilih dari yang ada di
-daftar lengkap.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="selectKeyboard-pa4">Jika Anda memilih keyboard yang berbasis karakter bukan latin, Anda akan
-melihat layar dialog tambahan yang menanyakan bagaimana Anda akan melakukan
-pergantian layout keyboard di antara Latin dan bukan Latin</para>
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
+extra dialogue screen asking how you would prefer to switch between the
+Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/id/selectKeyboardLive.xml b/docs/docs/stable/installer/id/selectKeyboardLive.xml
index 87161835..eb5f68ca 100644
--- a/docs/docs/stable/installer/id/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/id/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Select keyboard</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>You will be required to set the keyboard layout you wish to use in
-Mageia​​. The default one is selected according to your language and
-timezone previously selected.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/id/selectLanguage.xml b/docs/docs/stable/installer/id/selectLanguage.xml
index 94fdbdf6..e2602ca6 100644
--- a/docs/docs/stable/installer/id/selectLanguage.xml
+++ b/docs/docs/stable/installer/id/selectLanguage.xml
@@ -1,9 +1,33 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="id" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
   
+
   
+
   
+
   
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 04 01, using barjac's text -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -12,40 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Silakan pilih bahasa yang akan digunakan</title>
   </info>
-  <para condition="classical">Pilih bahasa yang Anda sukai dengan membentangkan daftar dari benua
-Anda. <application>Mageia</application> akan menggunakan pilihan ini selama
-instalasi dan pada sistem yang sudah terinstall.</para>
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
-  <para condition="classical">Jika sepertinya Anda akan memerlukan beberapa bahasa untuk komputer Anda,
-untuk Anda sendiri atau orang lain, maka gunakanlah tombol <guibutton>Banyak
-bahasa</guibutton> untuk menambahkannya sekarang. Akan sulit untuk
-menambahkan dukungan bahasa tambahan setelah instalasi selesai.</para>
+
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
+
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
+
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
-  <warning condition="classical">
-    <para>Bahkan jika Anda akan memilih lebih dari satu bahasa, Anda harus memilih
-salah satu sebagai bahasa yang lebih disukai di layar bahasa pertama. Bahasa
-tersebut juga akan ditandai sudah dipilih di layar banyak bahasa.</para>
-  </warning>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
+
   <itemizedlist>
     <listitem condition="classical">
-      <para>Jika bahasa keyboard tidak sama dengan bahasa yang akan dipilih, maka
-disarankan untuk menginstall bahasa dari keyboard yang digunakan juga.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
+
     <listitem>
-      <para>Mageia uses UTF-8 (Unicode) support by default.</para>
-      <para condition="classical">Ini bisa dimatikan di layar "banyak bahasa" jika tidak sesuai dengan bahasa
-Anda. Mematikan UTF-8 akan berpengaruh pada bahasa-bahasa yang diinstall.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
+
     <listitem>
-      <para>Anda bisa mengubah bahasa komputer Anda setelah instalasi selesai di Pusat
-Kendali Mageia -> Sistem -> Kelola lokalisasi untuk sistem Anda.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/id/selectMouse.xml b/docs/docs/stable/installer/id/selectMouse.xml
index b42e62d0..2b4d41dd 100644
--- a/docs/docs/stable/installer/id/selectMouse.xml
+++ b/docs/docs/stable/installer/id/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="id">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Pilih mouse</title>
   </info>
@@ -7,26 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Jika Anda tidak senang dengan respon mouse Anda, Anda bisa memilih mouse
 yang berbeda di sini.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Biasanya, <guilabel>Universal</guilabel> - <guilabel>Semua mouse PS/2 dan
-USB</guilabel> adalah pilihan bagus.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Pilih <guilabel>Universal</guilabel> - <guilabel>Paksa evdev</guilabel>
-untuk mengkonfigurasi tombol yang tidak bekerja pada mouse dengan enam
-tombol atau lebih.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/id/setupBootloader.xml b/docs/docs/stable/installer/id/setupBootloader.xml
index ec3a7b1c..979aab41 100644
--- a/docs/docs/stable/installer/id/setupBootloader.xml
+++ b/docs/docs/stable/installer/id/setupBootloader.xml
@@ -1,227 +1,198 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="id" xml:id="setupBootloader">
+  
+  
+  
+  
   
-
   
-
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Pilihan utama Bootloader</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
-
   <section>
-    <title>Bootloader interface</title>
-
-    <para>By default, Mageia uses exclusively:</para>
-
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-
-    <section>
-      <title>Grub2 on Legacy/MBR and Legacy/GPT systems</title>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-
-      <para>Don't modify the "Boot Device" unless you really know what you are doing.</para>
-    </section>
-
-    <section>
-      <title>Grub2-efi on UEFI systems</title>
-
-      <para>With an UEFI system, the user interface is slightly different as you cannot
-choose between with or without graphical menu</para>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to receive the bootloader
-(Grub2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds grub2-efi. Although it is possible to have
-several ESPs, only one is advised and enough whatever the number of
-operating systems you have.</para>
-
-      <para>Don't modify the "Boot Device" unless you really know what you are doing.</para>
-    </section>
-  </section>
-
-  <section>
-    <title xml:id="setupMageiaBootloader">Gunakan bootloader Mageia</title>
-
-    <para>By default, according to your system, Mageia writes a new:</para>
-
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard
-drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then uncheck the box
-<guilabel>Probe Foreign OS</guilabel></para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
-  </section>
-
-  <section>
-    <title>Gunakan bootloader yang ada</title>
-
-    <para>Prosedur yang sebenarnya untuk menambahkan Mageia ke bootloader yang sudah
-ada diluar ruang lingkup bantuan ini, tapi dalam kebanyakan kasus akan harus
-menjalankan program intalasi bootloader yang sesuai yang akan mendeteksi dan
-menambahkan secara otomatis. Lihat pada dokumentasi sistem operasi.</para>
-  </section>
-
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-
-    <para>If you don't want a bootable Mageia, but to chain load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
   </section>
-
   <section>
-    <title>Options</title>
-
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>First page</title>
-
-      <para><itemizedlist>
-          <listitem>
-            <para><guilabel>Delay before booting the default image</guilabel>: This text box
-lets you set a delay in seconds before the default operating system is
-started up.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be asked at the boot
-time to select a booting entry or change settings. The username is "root"
-and the password is the one chosen here after.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Password</guilabel>: This text box is where you actually put the
-password</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Password (again)</guilabel>: Retype the password and Drakx will
-check that it matches with the one set above.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Advanced</guilabel></para>
-
-            <itemizedlist>
-              <listitem>
-                <para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for the power management. It can save energy by
-stopping unused devices, this was the method used before APM. Unchecking it
+      <title>Pilihan utama Bootloader</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable SMP</guilabel>: This option enables / disables symmetric
-multiprocessing for multi core processors.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the
-operating system access to the Advanced Programmable Interrupt
-Controller. APIC devices permit more complex priority models, and Advanced
-IRQ (Interrupt Request)  management.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which
-manages all external interrupts for a specific processor in an SMP system.</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist></para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
-
     <section>
-      <title>Next page</title>
-
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
-
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist>
-              <listitem>
-                <para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-the boot menu will use. If you click the down triangle you will be offered
-other size and colour depth options.</para>
-              </listitem>
-
-              <listitem>
-                <para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para>
-              </listitem>
-            </itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Gunakan bootloader yang ada</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Tambah atau Modifikasi Entri Menu Boot</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/setupBootloaderAddEntry.xml b/docs/docs/stable/installer/id/setupBootloaderAddEntry.xml
index 893ec339..3f7a4fec 100644
--- a/docs/docs/stable/installer/id/setupBootloaderAddEntry.xml
+++ b/docs/docs/stable/installer/id/setupBootloaderAddEntry.xml
@@ -1,15 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns5="http://www.w3.org/2000/svg" version="5.0" xml:lang="id" xml:id="setupBootloaderAddEntry">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="setupBootloaderAddEntry">
   
+
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
 
 Lebarhon 2016 12 16 Updated for Mageia 6-->
 <title xml:id="setupBootloaderAddEntry-ti1">Tambah atau Modifikasi Entri Menu Boot</title>
   </info>
-  <para>To do that you need to manually edit /boot/grub2/custom.cfg or use the
-software grub-customizer instead (Available in the Mageia repositories).</para>
+
+  <para>To do this you need to manually edit /boot/grub2/custom.cfg or use the
+software <emphasis role="bold">grub-customizer</emphasis> tool instead
+(available in the Mageia repositories).</para>
+
   <note>
-    <para>For more information, see our wiki: <link
+    <para>For more information, see: <link
 ns2:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
   </note>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/setupSCSI.xml b/docs/docs/stable/installer/id/setupSCSI.xml
index aa3a2382..7e981176 100644
--- a/docs/docs/stable/installer/id/setupSCSI.xml
+++ b/docs/docs/stable/installer/id/setupSCSI.xml
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="setupSCSI" version="5.0" xml:lang="id">
-
+<section version="5.0" xml:lang="id" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Pengaturan SCSI</title>
   </info>
 
   
+
   
+
   
+
   
-   
+
   
+
   
+
   
+
   
+
   
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- JohnR - edited 2012-03-03 -->
@@ -30,16 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata revision="1" fileref="dx2-setupSCSI.png"
-format="PNG" align="center" xml:id="setupSCSI-im1"></imagedata>
-</imageobject></mediaobject>
-
-  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX biasanya mendeteksi harddisk dengan benar. Dengan kontroler SCSI lama
-mungkin tidak akan bisa menentukan driver yang tepat untuk digunakan dan
-menyebabkan gagal mengenali perangkat.</para>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="setupSCSI-pa2">Jika ini terjadi, Anda harus menentukan secara manual perangkat SCSI mana
-yang Anda miliki pada Drakx.</para>
+  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
+SCSI controllers it may be unable to determine the correct drivers to use
+and subsequently fail to recognise the drive.</para>
 
-  <para revision="3" xml:id="setupSCSI-pa3">DrakX lalu akan bisa mengkonfigurasi perangkat yang tepat.</para>
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
 </section>
diff --git a/docs/docs/stable/installer/id/software.xml b/docs/docs/stable/installer/id/software.xml
new file mode 100644
index 00000000..dea9f35b
--- /dev/null
+++ b/docs/docs/stable/installer/id/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="id" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/id/soundConfig.xml b/docs/docs/stable/installer/id/soundConfig.xml
index bcb34f1d..0e483f38 100644
--- a/docs/docs/stable/installer/id/soundConfig.xml
+++ b/docs/docs/stable/installer/id/soundConfig.xml
@@ -1,39 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="id">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Konfigurasi Suara</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Di layar ini, nama driver yang dipilih oleh insaller untuk perangkat suara
-Anda diberikan, yang akan jadi driver baku jika ada.</para>
+  
 
-  <para>Driver baku seharusnya bekerja tanpa masalah. Tetapi, jika setelah instalasi
-Anda menemukan masalah, jalankan  <command>draksound</command> atau jalankan
-alat ini melalui MCC (Pusat Konfigurasi Mageia), dengan memilih tab
-<guilabel>Hardware</guilabel> lalu mengklik <guilabel>Konfigurasi
-Suara</guilabel> di kanan atas layar.</para>
+  
 
-  <para>Lalu, pada draksound atau layar alat "Konfigurasi Suara", klik
-<guibutton>Lanjutan</guibutton> lalu <guibutton>Pemecahan
-masalah</guibutton> untuk menemukan saran berguna tentang bagaimana cara
-mengatasi masalah.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Lanjutan</title>
     </info>
 
-    <para>Mengklik <guibutton>Lanjutan</guibutton> di layar ini, selama instalasi,
-berguna jika tidak ada driver baku dan ada beberapa driver yang tersedia,
-tapi Anda pikir installer memilih yang salah.</para>
-
-    <para>Jika seperti itu, Anda bisa memilih driver yang berbeda setelah mengklik
-<guibutton>Biarkan saya memilih driver</guibutton>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/id/takeOverHdConfirm.xml b/docs/docs/stable/installer/id/takeOverHdConfirm.xml
index 477e5f31..a2d458a3 100644
--- a/docs/docs/stable/installer/id/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/id/takeOverHdConfirm.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="id" xml:id="takeOverHdConfirm">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Konfirmasi harddisk yang akan diformat</title>
   </info>
@@ -7,7 +13,11 @@
   
 
   
+
   
+
+  
+
   
 
   
@@ -19,16 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition='live'> <imagedata
-fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
-fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject></mediaobject>
-
-  <para revision="1" xml:id="takeOverHdConfirm-pa1">Klik <guibutton>Sebelumnya</guibutton> jika Anda tidak yakin dengan pilihan
-Anda.</para>
-
-  <para revision="1" xml:id="takeOverHdConfirm-pa2">Klik pada <guibutton>Selanjutnya</guibutton> jika Anda yakin dan ingin
-menghapus semua partisi, semua sistem operasi dan semua data pada harddisk
-tersebut.</para>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
+choice.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/id/testing.xml b/docs/docs/stable/installer/id/testing.xml
index 017a0b8c..8d4f424e 100644
--- a/docs/docs/stable/installer/id/testing.xml
+++ b/docs/docs/stable/installer/id/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testing Mageia as Live system</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Live mode</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>You get this screen if you selected "Boot Mageia". If not, you get the
-"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Testing hardware</title>
       </info>
 
-      <para>One of the Live mode goals is to test if the hardware is correctly managed
-by Mageia. You can check if all devices have a driver in the Hardware
-section of the Mageia Control Center. You can test the most current devices:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>graphical card: if you see the previous screen, it's already OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webcam:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>printer: configure it and print a test page</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
       </itemizedlist>
 
-      <para>If all is OK for you, you can process to the installation. If not, you can
-leave with the quit button.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>The configuration settings you made here are kept for the installation.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,15 +68,14 @@ leave with the quit button.</para>
         <title xml:id="testing3-ti1">Launch installation</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
-SSD drive, simply click on the icon "Install on Hard Disk". You will get
-this screen, and then the "<link
-linkend="doPartitionDisks">Partitioning</link> step" as for the direct
-installation.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/id/uninstall-Mageia.xml b/docs/docs/stable/installer/id/uninstall-Mageia.xml
index bfb7390d..06418904 100644
--- a/docs/docs/stable/installer/id/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/id/uninstall-Mageia.xml
@@ -1,40 +1,48 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="id">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="id" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Uninstall Mageia</title>
   </info>
 
   
 
-  <section>
-    <title xml:id="uninstall-Mageia-ti2">Tata cara</title>
+  
 
-    <para>Jika Mageia tidak meyakinkan Anda atau Anda tidak bisa menginstallnya dengan
-sempurna, pendeknya Anda ingin membuangnya. Itu adalah hak Anda dan Mageia
-memberikan kemungkinan untuk melakukan uninstall. Ini tidak ada di semua
-sistem operasi.</para>
+  <para>If Mageia didn't convince you or you can't install it correctly - in short
+you want get rid of it - that is your right and Mageia also gives you the
+possibility to uninstall. This is not true for every operating system.</para>
 
-    <para>Setelah backup data Anda, jalankan ulang DVD instalasi Mageia, lalu pilih
-sistem Penyelamat, lalu, Kembalikan boot loader Windows. Pada boot
-berikutnya, Anda hanya akan punya Windows tanpa pilihan untuk memilih sistem
-operasi.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-    <para>Untuk mengembalikan ruang yang digunakan oleh Mageia pada Windows, klik pada
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code> untuk mengakses manajemen partisi. Anda
-akan mengenali partisi Mageia karena mereka akan bernama
-<guilabel>Unknown</guilabel>, dan juga berdasarkan ukurannya dan tempatnya
-pada disk. Klik kanan pada setiap partisi tersebut lalu pilih
-<guibutton>Delete</guibutton>. Ruang akan dibebaskan.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-    <para>Jika Anda menggunakan Windows XP, Anda bisa membuat partisi baru lalu format
-(FAT32 atau NTFS). Dia akan mendapatkan huruf partisi.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
-    <para>Jika Anda menggunakan Vista atau 7, Anda punya kemungkinan lainnya, Anda
-bisa memperluas partisi yang ada di sisi kiri dari ruang bebas. Ada juga
-alat pemartisi lain yang bisa digunakan, seperti gparted, tersedia untuk
-windows dan linux. Seperti biasa, ketika mengubah partisi, sangat hati-hati,
-dan pastikan semua yang penting telah dibackup.</para>
-  </section>
-</section>
\ No newline at end of file
+  <para>If you have Vista or 7, you have one more possibility, you can extend the
+existing partition that is at the left of the freed space. There are other
+partitioning tools that can be used, such as <emphasis
+role="bold">gparted</emphasis>, available for both Windows and Linux. As
+always, when changing partitions, be very careful to back up anything
+important to you.</para>
+</section>
diff --git a/docs/docs/stable/installer/id/unused.xml b/docs/docs/stable/installer/id/unused.xml
index b3428486..eab24fbb 100644
--- a/docs/docs/stable/installer/id/unused.xml
+++ b/docs/docs/stable/installer/id/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="id" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="id">
   <info>
     <title xml:id="unused-ti1">Keep or delete unused material</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para>In this step, the installer looks for unused locales packages and unused
-hardware packages. Then it proposes you to delete them. It is a good idea to
-accept, except if you prepare an installation which has to run on different
-hardware.</para>
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
+
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>The next step is the copying of files on hard disk. This takes some
-minutes. At the end, you get a blank screen for some time, it's normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/it/DrakLive-cover.xml b/docs/docs/stable/installer/it/DrakLive-cover.xml
index 479eaea7..af1e7629 100644
--- a/docs/docs/stable/installer/it/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/it/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="it" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="it" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Installation from LIVE medium</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>January 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Installation from LIVE medium</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">La documentazione ufficiale di Mageia</para>
+      <para role="tagline">La documentazione ufficiale di Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>I testi e le schermate di questo manuale sono disponibili sotto CC BY-SA 3.0
+
+      <para>I testi e le schermate di questo manuale sono disponibili sotto 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>Questo manuale è stato prodotto con l'aiuto di <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Questo manuale è stato prodotto con l'aiuto di <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> sviluppato da <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-            </para>
-            <para>E' stato scritto da volontari nel loro tempo libero. Contatta <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>E' stato scritto da volontari nel loro tempo libero. Contatta <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Team
-Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</para> 
+Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</para>
     </cover>
   </info>
+
   <article>
     <title>Installation from LIVE medium</title>
-       <para><note>
-          <para>No one will see all the installer screens that you see in this manual. Which
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
 screens you will see, depends on your hardware and the choices you make
 while installing.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/it/DrakLive.xml b/docs/docs/stable/installer/it/DrakLive.xml
index dbf7a031..260bf469 100644
--- a/docs/docs/stable/installer/it/DrakLive.xml
+++ b/docs/docs/stable/installer/it/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="it" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="it" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Installation from LIVE medium</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Installation from LIVE medium</title>
 
     <cover>
       <para><note>
@@ -17,9 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> sviluppato da <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>E' stato scritto da volontari nel loro tempo libero. Contatta <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Team
-Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</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>
 
@@ -39,7 +54,12 @@ Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +69,18 @@ Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/it/DrakX-cover.xml b/docs/docs/stable/installer/it/DrakX-cover.xml
index 024ade08..f1e75be4 100644
--- a/docs/docs/stable/installer/it/DrakX-cover.xml
+++ b/docs/docs/stable/installer/it/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="it" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="it" xml:id="Quick-Startup"
+      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>Installazione con DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Febbraio 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Febbraio 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">La documentazione ufficiale di Mageia</para>
+      <para role="tagline">La documentazione ufficiale di Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>I testi e le schermate di questo manuale sono disponibili sotto CC BY-SA 3.0
+
+      <para>I testi e le schermate di questo manuale sono disponibili sotto 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>Questo manuale è stato prodotto con l'aiuto di <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Questo manuale è stato prodotto con l'aiuto di <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> sviluppato da <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>E' stato scritto da volontari nel loro tempo libero. Contatta <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>E' stato scritto da volontari nel loro tempo libero. Contatta <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Team
-Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</para> 
+Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Installazione con DrakX</title>
-       <para><note>
-          <para>No one will see all the installer screens that you see in this manual. Which
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
 screens you will see, depends on your hardware and the choices you make
 while installing.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ while installing.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/it/DrakX-inline.xml b/docs/docs/stable/installer/it/DrakX-inline.xml
new file mode 100644
index 00000000..caefa330
--- /dev/null
+++ b/docs/docs/stable/installer/it/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="it" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Installazione con DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the choices you make
+while installing.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">I testi e le schermate di questo manuale sono disponibili sotto 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>Questo manuale è stato prodotto con l'aiuto di <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> sviluppato da <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>E' stato scritto da volontari nel loro tempo libero. Contatta <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Team
+Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/DrakX.xml b/docs/docs/stable/installer/it/DrakX.xml
index 2683db1c..e822aa90 100644
--- a/docs/docs/stable/installer/it/DrakX.xml
+++ b/docs/docs/stable/installer/it/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="it" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="it" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Installazione con DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Installazione con DrakX</title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ Documentazione</link>, se vuoi aiutare a migliorare questo manuale.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/it/SelectAndUseISOs2.xml b/docs/docs/stable/installer/it/SelectAndUseISOs2.xml
index 08bd9bdb..99e9e114 100644
--- a/docs/docs/stable/installer/it/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/it/SelectAndUseISOs2.xml
@@ -1,40 +1,75 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="it" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Seleziona e utilizza dei file ISO</title>
   </info>
   <section>
     <title>Introduzione</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
-which image match your needs.</para>
-    <para>There is two families of media:</para>
+which image best suits your needs.</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: After booting the media, it will follow a process
-allowing to choose what to install and how to configure your target
-system. This give you the maximal flexibility for a customized installation,
-in particular to choose which Desktop Environment you will install.</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
       </listitem>
       <listitem>
-        <para>LIVE media: you can boot the media in a real Mageia system without
-installing it, to see what you will get after installation.  The
-installation process is simpler, but you get lesser choices.</para>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Details are given in the next sections.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Media</title>
     <section>
       <title>Definizione</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support the ISO
-file is copied to.</para>
-      <para>Puoi trovarli <link
-ns4:href="http://www.mageia.org/en/downloads/">qui</link>.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
+      <para>You can find Mageia ISO's <link
+ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
     <section>
       <title>Media di installazione classico</title>
@@ -42,25 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">qui</link>.</para>
         <title>Funzioni comuni</title>
         <itemizedlist>
           <listitem>
-            <para>Queste ISO usano l'installer tradizionale chiamato drakx</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
-            <para>Possono fare sia un'installazione pulita o un update da una release
-precedente.</para>
+            <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Diversi media per architetture a 32 o 64 bit.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Alcuni strumenti sono disponibili nella schermata di benvenuto: Recupero di
-Sistema, Test della Memoria, Strumento di Identificazione Hardware.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Ogni DVD contiene diversi desktop environments e lingue.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Ti sarà data la possibilità, durante l'installazione, di aggiungere software
-non free.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -71,22 +106,20 @@ non free.</para>
         <title>Funzioni comuni</title>
         <itemizedlist>
           <listitem>
-            <para>Può essere utilizzato per avere un'anteprima della distribuzione senza
-installarla su di un HDD avendo comunque la possibilità di farlo.</para>
+            <para>Can be used to preview the Mageia operating system without having to install
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Diversi media per architetture a 32 o 64 bit.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Le Live ISO possono solo essere utilizzate per
-un'installazione da zero. Non possono essere usate per aggiornare una
-precedente release.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Contengono del software non libero.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -94,13 +127,13 @@ precedente release.</emphasis></para>
         <title>Live DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Plasma desktop environment only.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Sono presenti tutte le lingue.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -108,13 +141,13 @@ precedente release.</emphasis></para>
         <title>DVD Live con GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>Solamente l'ambiente GNOME.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Sono presenti tutte le lingue.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -122,39 +155,27 @@ precedente release.</emphasis></para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Xfce desktop environment only.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Sono presenti tutte le lingue.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 or 64 bit architectures.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
     </section>
     <section>
-      <title>Boot-only CD media</title>
+      <title>Net install media</title>
       <section>
         <title>Funzioni comuni</title>
         <itemizedlist>
           <listitem>
-            <para>Ognuna è una piccola immagine che contiene non più del necessario per
-avviare l'installer Drakx e trovare drakx-installer-stage2 e altri pacchetti
-che sono necessari per continuare e completare l'installazione. Questi
-pacchetti possono essere nell'hard disk del pc, su di un disco locale, su un
-network locale o su internet.</para>
-          </listitem>
-          <listitem>
-            <para>Questi media sono davvero leggeri (meno di 100 MB) e convenienti quando la
-connessione è troppo lenta per scaricare un intero DVD, quando si ha un PC
-senza DVD o un PC che non può eseguire il boot da una chiavetta USB.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Diversi media per architetture a 32 o 64 bit.</para>
-          </listitem>
-          <listitem>
-            <para>Solamente la lingua inglese.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -162,8 +183,8 @@ senza DVD o un PC che non può eseguire il boot da una chiavetta USB.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -171,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contiene software proprietario (in gran parte driver, codec...) per le
-persone che ne hanno bisogno.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -183,63 +203,88 @@ persone che ne hanno bisogno.</para>
     <section>
       <title>Download in corso</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
-BitTorrent. In both cases, a window gives you some information, such as the
-mirror in use and an opportunity to change if the bandwidth is to low. If
-http is chosen, you may also see something like</para>
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
-them. Keep one of them <link linkend="integrity">for further
-usage</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Check the radio button Save File.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
-      <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
-file to be downloaded. When you ask these algorithms to recalculate this
-number from your downloaded file, either you have the same number and your
-downloaded file is correct, or the number is different and you have a
-failure. A failure infers that you should retry the download or attempt a
-repair using BitTorrent.</para>
-      <para>Aprire la console, senza obbligo di essere root, e:</para>
-      <para>- Per usare md5sum digitare: [sam@localhost]$ <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
-      <para>- Per usare sha1susm digitare: [sam@localhost]$ <userinput>sha1sum
-path/to/the/image/file.iso</userinput>.</para>
-      <para>e comparate il numero ottenuto a computer (potrebbe essere necessario
-attendere un poco) a quello dato da Mageia. Per esempio:</para>
+      <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
+      <para>To generate the checksum for your downloaded ISO, open a console, (no need
+to be root), and:</para>
+      <itemizedlist>
+        <listitem>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+        <listitem>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+      </itemizedlist>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para/>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Masterizza o esegui un dump dell'ISO</title>
-    <para>L'ISO controllata può essere masterizzata su un CD o un DVD o dumpata su di
-una chiavetta USB. Queste operazioni non sono una semplice copia e puntano e
-creare un media avviabile.</para>
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
     <section>
       <title>Masterizzando la ISO su di un CD/DVD</title>
-      <para>Usa qualsiasi programma di masterizzazione che desideri, ma assicurati che
-il dispositivo sia correttamente impostato in <emphasis
-role="bold">masterizza un immagine</emphasis>, masterizza data o files non
-va bene. Maggiori informazioni sul <link
-ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">wiki di
-Mageia</link>.</para>
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
+ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
+wiki</link> for more information.</para>
     </section>
     <section>
       <title>Esegui il dump di una ISO su di una chiavetta USB.</title>
-      <para>Tutte le ISO di Mageia sono ibride il che significa che puoi 'dumparle' in
-una chiavetta USB e usarle per avviare e installare il sistema.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"dumpare" un'immagine in un flash drive distrugge ogni precedente
-file-system su quel dispositivo; ogni altro dato verrà perso e la capacità
-della partizione ridotta alla grandezza dell'immagine del disco.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>To recover the original capacity, you must redo partitioning and re-format
-the USB stick.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Using a graphical tool within Mageia</title>
         <para>Puoi usare uno strumento grafico come <link
@@ -248,41 +293,51 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
       <section>
         <title>Using a graphical tool within Windows</title>
         <para>Potresti provare:</para>
-        <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
-        <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
+        <itemizedlist>
+          <listitem>
+            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
+          </listitem>
+          <listitem>
+            <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
+Imager</link></para>
+          </listitem>
+        </itemizedlist>
       </section>
       <section>
-        <title>Using Command line within a GNU/Linux system</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
-          <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
-disc partition if you get the device-ID wrong.</para>
+          <para>It is potentially *dangerous* to do this by hand. You risk overwriting
+potentially valuable existing data if you specify the wrong target device.</para>
         </warning>
-        <para>Puoi anche usare il tool dd in una console:</para>
         <orderedlist>
           <listitem>
             <para>Apri una console</para>
           </listitem>
           <listitem>
-            <para>Diventa root con il comando <userinput>su -</userinput> (non dimenticare la
-'-' finale)</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Collega la tua chiavetta USB (non montarla, questo significa anche non
-aprire alcuna applicazione o file manager che può averne accesso o
-leggerla).</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Inserisci il comando <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
-            <para>Alternatively, you can get the device name with the command
-<code>dmesg</code>: at end, you see the device name starting with
-<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
-            <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
+          </listitem>
+          <listitem>
+            <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+            <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
+            <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
 [72594.770536] usb 1-1: Product: Mass Storage Device
@@ -299,24 +354,28 @@ leggerla).</para>
 [72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
 [72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
 [72595.967251]  <emphasis>sdd</emphasis>: sdd1
-[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
-          </listitem>
-          <listitem>
-            <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Inserisci il comando: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX
-bs=1M</userinput></para>
-            <para>Dove X = nome del tuo dispositivo esempio: /dev/sdc</para>
-            <para>Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
-of=/dev/sdb bs=1M</userinput></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
+            <tip>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
+            </tip>
           </listitem>
           <listitem>
-            <para>Inserire il comando: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
-            <para>Togli la tua chiavetta USB, hai concluso</para>
+            <para>This is the end of the process, and you may now unplug your USB stick.</para>
           </listitem>
         </orderedlist>
       </section>
diff --git a/docs/docs/stable/installer/it/acceptLicense.xml b/docs/docs/stable/installer/it/acceptLicense.xml
index 6602c1d2..0c6a7c12 100644
--- a/docs/docs/stable/installer/it/acceptLicense.xml
+++ b/docs/docs/stable/installer/it/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,33 +37,44 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Note di rilascio</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
-revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
-</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
-revision="5" align="center" condition="live" format="PNG"
-fileref="live-license.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="acceptLicense-im1" fileref="dx2-license.png" align="center"
+revision="4"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-license.png" xml:id="acceptLicense-im2" revision="5"
+align="center" condition="live"/> </imageobject></mediaobject>
 
   <section xml:id="license">
     <info>
       <title xml:id="license-ti1">Accordo di licenza</title>
     </info>
 
-    <para>Prima di installare <application>Mageia</application>, per favore leggi con
-cautela i termini e le condizioni della licenza.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Questi termini e condizioni si applicano all'intera distribuzione
-<application>Mageia</application> e devono essere accettati per poter
-proseguire.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Per accettare, seleziona semplicemente <guilabel>Accetta</guilabel> e quindi
-clicca su <guibutton>Avanti</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Se decidi di non accettare queste condizioni, ti ringraziamo per averci
-provato. Cliccando <guibutton>Esci</guibutton> riavvierà il tuo computer.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -75,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Vengono date informazioni importanti riguardo al rilascio di
-<application>Mageia</application> e sono accessibili cliccando sul bottone
-<guibutton>Rilascia Note</guibutton>.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/addUser.xml b/docs/docs/stable/installer/it/addUser.xml
index 8340e6d2..c062fee6 100644
--- a/docs/docs/stable/installer/it/addUser.xml
+++ b/docs/docs/stable/installer/it/addUser.xml
@@ -1,107 +1,134 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="it" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Gestione dell'utente e del superuser</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
+
   
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Imposta la password dell'amministratore (root):</title>
     </info>
-    <para>It is advisable for all <application>Mageia</application> installations to
-set a superuser or administrator's password, usually called the
-<emphasis>root password</emphasis> in Linux. As you type a password into the
-top box the colour of its shield will change from red to yellow to green
-depending on the strength of the password. A green shield shows you are
-using a strong password. You need to repeat the same password in the box
-just below the first password box, this checks that you have not mistyped
-the first password by comparing them.</para>
+
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
+
     <note xml:id="givePassword">
-      <para>Tutte le passwords sono sensibili alle maiuscole, la cosa migliore in una
-password è usare una combinazione di lettere (maiuscole e minuscole), numeri
-e altri caratteri.</para>
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
+
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Inserisci un utente</title>
     </info>
-    <para>Add a user here. A user has fewer rights than the superuser (root), but
-enough to use the internet, office applications or play games and anything
-else the average user does with his computer</para>
+
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
+
     <itemizedlist>
       <listitem>
-        <para><guibutton>Icon</guibutton>: se premi su questo bottone cambierà l'icona
-utente.</para>
+        <para><emphasis role="bold">Icon</emphasis></para>
+
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Vero nome</guilabel>: Inserisci il vero nome dell'utente in questo
-spazio.</para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Login Name</guilabel>: Here you enter the user login name or let
-drakx use a version of the user's real name. <emphasis>The login name is
-case sensitive.</emphasis></para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Password</guilabel>: In this text box you should type in the user
-password. There is a shield at the end of the text box that indicates the
-strength of the password. (See also <xref linkend="givePassword"/>)</para>
-      </listitem>
-      <listitem>
-        <para><guilabel>Password (again)</guilabel>: Retype the user password into this
-text box and drakx will check you have the same password in each of the user
-password text boxes.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
+
     <note>
-      <para>Any user you add while installing Mageia, will have a both read and write
-protected home directory (umask=0027).</para>
-      <para>You can add all extra needed users in the <emphasis>Configuration -
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
+
+      <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
 management</emphasis>.</para>
+
       <para>I permessi di accesso possono anche essere cambiati dopo l'installazione.</para>
     </note>
   </section>
-  <section xml:id="addUserAdvanced" condition="classical">
+
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Gestione Avanzata Utenti</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
-    <para>If the <guibutton>advanced</guibutton> button is clicked you are offered a
-screen that allows you to edit the settings for the user you are adding.</para>
-    <para condition="classical">Inoltre, puoi disattivare o attivare un account speciale.</para>
-    <warning condition="classical">
-      <para>Anything a guest with a default <emphasis>rbash</emphasis> guest account
-saves to his /home directory will be erased when he logs out.  The guest
-should save his important files to a USB key.</para>
-    </warning>
+
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
+
     <itemizedlist>
-      <listitem condition="classical">
-        <para><guilabel>Abilita guest account</guilabel>: Qua puoi abilitare o
-disabilitare un guest account. Un guest account permette a degli ospiti di
-eseguire il log in e utilizzare il PC, ma con un accesso molto limitato
-rispetto a un utente normale.</para>
-      </listitem>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop down list allows you to change the
-shell used by the user you are adding in the previous screen, options are
-Bash, Dash and Sh</para>
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
+
       <listitem>
-        <para><guilabel>User ID</guilabel>: Qua puoi impostare l'user ID per gli utenti
-che hai aggiunto nella schermata precedente. Questo è un numero. Lasciarlo
-vuoto nel caso in cui tu non sappia cosa fare.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
+
       <listitem>
-        <para><guilabel>Group ID</guilabel>: Questo ti permette di impostare il group
-ID. Anche questo un numero, di solito lo stesso dell'utente. Lasciare vuoto
-nel caso in cui tu non sappia cosa fare.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/it/add_supplemental_media.xml b/docs/docs/stable/installer/it/add_supplemental_media.xml
index 83268135..8939fcac 100644
--- a/docs/docs/stable/installer/it/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/it/add_supplemental_media.xml
@@ -1,54 +1,57 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="it" xml:id="add_supplemental_media"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="it">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Selezione dei Media (Configura Media di Installazione Supplementari)</title>
-    </info>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
+  </info>
 
   
+
+  
+
+  
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
-<imageobject> <imagedata align="center"
-fileref="dx2-add_supplemental_media.png" format="PNG" revision="1"
-xml:id="dx2-add_supplemental_media-im1"/> </imageobject></mediaobject>
-
-  <para>Questa schermata vi dà la lista degli archivi già riconosciuti. È possibile
-aggiungere altre fonti per i pacchetti, come un disco ottico o una sorgente
-remota. La selezione della sorgente determina quali pacchetti saranno
-disponibili per la selezione durante i passaggi successivi.</para>
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
+<imageobject> <imagedata format="PNG"
+fileref="dx2-add_supplemental_media.png"
+xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Per le risorse di rete, ci sono due passi da seguire:</para>
 
   <orderedlist>
     <listitem>
-      <para>Scelta e attivazione della rete, in caso non sia già attiva. </para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
-      <para>Seleziona uno specchio o specifica un URL (il primo ingresso). Selezionando
-uno specchio, hai accesso alla selezione di tutti i depositi gestiti da
-Mageia, come quelli di Nonfree, Tainted e gli Aggiornamenti. Con l'URL, puoi
-designare un deposito specifico o la tua stessa installazione NFS.</para>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
-    <note>
-      <para>If you are updating a 64 bit installation which may contain some 32 bit
+  <note>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
 packages, it is advised to use this screen to add an online mirror by
-ticking one of the Network protocols here. The 64 bit DVD iso only contains
-64 bit and noarch packages, it will not be able to update the 32 bit
-packages. However, after adding an online mirror, installer will find the
-needed 32 bit packages there.</para>
-     </note>
-
-</section>
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/ask_mntpoint_s.xml b/docs/docs/stable/installer/it/ask_mntpoint_s.xml
index 3b21570f..74eecda7 100644
--- a/docs/docs/stable/installer/it/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/it/ask_mntpoint_s.xml
@@ -1,27 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="ask_mntpoint_s" version="5.0" xml:lang="it">
-
+<section version="5.0" xml:lang="it" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Scegli i punti di mount</title>
   </info>
 
   
+
   
+
   
+
   
+
+  
+
+  
+
   
+
   
+
   
+
   
+
   
 
-<mediaobject>
+  <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -33,56 +44,55 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
-xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-chooseMountpoints.png" align="center" format="PNG"
-xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
 
   <para>Here you see the Linux partitions that have been found on your computer. If
-you don't agree with the <application>DrakX</application> suggestions, you
-can change the mount points.</para>
-
-  <note>
-    <para>Se cambi qualcosa assicurati di avere ancora una partizione
-<literal>/</literal> (root).</para>
-  </note>
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Ogni partizione è mostrata come segue: "Dispositivo" ("Capacità", "Mount
-point", "Tipo")</para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para>"Device", is made up of: "hard drive", ["hard drive number"(letter)],
-"partition number" (for example, "sda5").</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
-    
     <listitem>
-      <para>If you have many partitions, you can choose many different mount points from
-the drop down menu, such as <literal>/</literal>, <literal>/home</literal>
-and <literal>/var</literal>. You can even make your own mount points, for
-instance <literal>/video</literal> for a partition where you want to store
-your films, or <literal>/cauldron-home</literal> for the
-<literal>/home</literal> partition of a cauldron install.</para>
-    </listitem>
-
-    <listitem>
-      <para>Per le partizioni a cui non necessiti avere accesso puoi lasciare uno spazio
-vuoto nel punto di mount.</para>
+      <para>For any partitions that you don't need to make use of, you can leave the
+mount point field blank.</para>
     </listitem>
   </itemizedlist>
 
   <warning>
-    <para>Choose <guibutton>Previous</guibutton> if you are not sure what to choose,
-and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen
-that follows, you can click on a partition to see its type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
   <para>If you are sure the mount points are correct, click on
-<guibutton>Next</guibutton>, and choose whether you only want to format the
-partition(s) DrakX suggests, or more.</para>
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
 </section>
diff --git a/docs/docs/stable/installer/it/bestTime.xml b/docs/docs/stable/installer/it/bestTime.xml
index bd53a011..1ad3a4f0 100644
--- a/docs/docs/stable/installer/it/bestTime.xml
+++ b/docs/docs/stable/installer/it/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="it" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="it" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Clock settings</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>In this step, you have to select on which time your internal clock is set,
-either local time or UTC time.</para>
-
-  <para>In advanced tab, you will find more options about clock settings.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/bootLive.xml b/docs/docs/stable/installer/it/bootLive.xml
index 1789e53e..7c54eb23 100644
--- a/docs/docs/stable/installer/it/bootLive.xml
+++ b/docs/docs/stable/installer/it/bootLive.xml
@@ -1,29 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="it"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
-DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
-bootloader to launch the installation automatically after rebooting the
-computer. If that does not happen you may need to reconfigure your BIOS or
-press one key that will offer you to choose the peripheral from which the
-computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
-ISO. According to your BIOS settings, the computer boots perhaps directly on
-the USB device already plugged in a port. If that does not happen you may
-need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
-or USB stick) without writing anything on the disk, so expect a very slow
-system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
-when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
-the inserted installation medium. Here, select other sources, like FTP or
-NFS servers. If the installation is carried out in a network with an SLP
-server, select one of the installation sources available on the server with
-this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
-optional disk with a driver update and will require its insertion during
-installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice)  or to
-process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
-duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para><para>In each case, the first steps will be the same to choose language, timezone
-and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Booting the medium</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>First screen while booting in BIOS mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">In UEFI mode</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/it/chooseDesktop.xml b/docs/docs/stable/installer/it/chooseDesktop.xml
index e2c08e8f..31964c7c 100644
--- a/docs/docs/stable/installer/it/chooseDesktop.xml
+++ b/docs/docs/stable/installer/it/chooseDesktop.xml
@@ -1,27 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Selezione Desktop</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Selezione Desktop</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to fine
-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application> or
-<application>Gnome</application> desktop environment. Both come with a full
-set of useful applications and tools. Tick <guilabel>Custom</guilabel> if
-you want to use neither or both, or if you want something other than the
-default software choices for these desktop environments. The
-<application>LXDE</application> desktop is lighter than the previous two,
-sporting less eye candy and fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/it/choosePackageGroups.xml b/docs/docs/stable/installer/it/choosePackageGroups.xml
index 91ae4330..f0bed75c 100644
--- a/docs/docs/stable/installer/it/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/it/choosePackageGroups.xml
@@ -1,39 +1,42 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Selezione per gruppi di pacchetti</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
-  <para>Packages have been sorted into groups, to make choosing what you need on
+  <para>Packages are arranged into common groups, to make choosing what you need on
 your system a lot easier. The groups are fairly self explanatory, however
 more information about the content of each is available in tool-tips which
 become visible as the mouse is hovered over them.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Stazione di lavoro.</para>
+      <para><emphasis role="bold">Workstation</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Server.</para>
+      <para><emphasis role="bold">Server</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Ambiente grafico.</para>
+      <para><emphasis role="bold">Graphical Environment</emphasis></para>
     </listitem>
 
     <listitem>
-      <para>Individual Package Selection: You can use this option to manually add or
-remove packages.</para>
+      <para><emphasis role="bold">Individual Package Selection</emphasis>: you can use
+this option to manually add or remove packages</para>
     </listitem>
   </itemizedlist>
 
-  <para>Read <xref linkend="minimal-install"/> for instructions on how to do a
+  <para>See <xref linkend="minimal-install"/> for instructions on how to do a
 minimal install (without or with X &amp; IceWM).</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/choosePackagesTree.xml b/docs/docs/stable/installer/it/choosePackagesTree.xml
index 85daf22d..ec26b891 100644
--- a/docs/docs/stable/installer/it/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/it/choosePackagesTree.xml
@@ -1,23 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="choosePackagesTree">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="it">
+  <info>
+    <title xml:id="choosePackagesTree-ti1">Scegli dei pacchetti individuali</title>
+  </info>
 
-    <info>
-      <title xml:id="choosePackagesTree-ti1">Scegli dei pacchetti individuali</title>
-    </info>
+  
 
-    
+  
 
-<mediaobject>
-<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
-<imageobject> <imagedata fileref="dx2-choosePackagesTree.png" align="center"
-format="PNG" ></imagedata> </imageobject></mediaobject>
+  
 
-    <para>Qui tu puoi aggiungere o rimuovere ogni pacchetto aggiuntivo per
-personalizzare la tua installazione</para>
+  <mediaobject>
+<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
+align="center"/> </imageobject></mediaobject>
 
-    <para>After having made your choice, you can click on the <guibutton>floppy
-icon</guibutton> at the bottom of the page to save your choice of packages
-(saving to a USB key works, too). You can then use this file to install the
-same packages on another system, by pressing the same button during install
-and choosing to load it.</para>
-  </section>
+  <para>Here you can add or remove any extra packages to customize your
+installation.</para>
 
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/configureServices.xml b/docs/docs/stable/installer/it/configureServices.xml
index fdb80053..f40f84dc 100644
--- a/docs/docs/stable/installer/it/configureServices.xml
+++ b/docs/docs/stable/installer/it/configureServices.xml
@@ -1,40 +1,37 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="configureServices" version="5.0" xml:lang="it">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="it" xml:id="configureServices">
+  <info>
+    <title xml:id="configureServices-ti1">Configura i tuoi servizi</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="configureServices-ti1">Configura i tuoi servizi</title>
-    </info>
+  
 
-    
-   
+  
 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureServices.png"
-align="center" format="PNG" xml:id="configureServices-im1"></imagedata>
-</imageobject></mediaobject>
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
+xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
+  <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-    <para revision="1" xml:id="configureServices-pa1">Qua puoi scegliere quali servizi (non) devono essere avviati al boot del
-sistema.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-    <para revision="1" xml:id="configureServices-pa2">There are four groups, click on the triangle before a group to expand it and
-see all services in it.</para>
-
-    <para revision="1" xml:id="configureServices-pa3">Le impostazioni che sceglie DrakX sono generalmente buone.</para>
-
-    <para revision="1" xml:id="configureServices-pa4">If you highlight a service, some information about it is shown in the info
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">If you highlight a service, some information about it is shown in the info
 box below.</para>
+    </listitem>
+  </itemizedlist>
 
-    <para revision="1" xml:id="configureServices-pa5">Cambia le cose solo quando sai veramente bene cosa stai facendo.</para>
-  </section>
-
+  <para xml:id="configureServices-pa5" revision="1">Cambia le cose solo quando sai veramente bene cosa stai facendo.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/configureTimezoneUTC.xml b/docs/docs/stable/installer/it/configureTimezoneUTC.xml
index 5e1e4848..283a1158 100644
--- a/docs/docs/stable/installer/it/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/it/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="configureTimezoneUTC">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="it">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Configura il tuo fuso orario</title>
   </info>
@@ -7,20 +7,30 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject condition="classical"> <imagedata
-xml:id="configureTimezoneUTC-im1" revision="1"
-fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
-</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
-condition="live" format="PNG"/> </imageobject></mediaobject>
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="configureTimezoneUTC-im1" align="center"
+fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa1">Scegli la tua time zone selezionando il tuo Paese o una città vicino alla
-tua nella stessa zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para revision="1" xml:id="configureTimezoneUTC-pa2">Nella prossima schermata potrai scegliere di impostare il tuo orologio
-hardware con l'ora locale o GMT (anche conosciuto come UTC).</para>
+  <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
+or to GMT, also known as UTC.</para>
 
   <note>
     <para revision="1" xml:id="configureTimezoneUTC-pa3">Se hai più di un sistema operativo sul tuo computer assicurati che siano
diff --git a/docs/docs/stable/installer/it/configureX_card_list.xml b/docs/docs/stable/installer/it/configureX_card_list.xml
index 8b21672d..e4b50f2a 100644
--- a/docs/docs/stable/installer/it/configureX_card_list.xml
+++ b/docs/docs/stable/installer/it/configureX_card_list.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="configureX_card_list">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
@@ -6,20 +13,28 @@
   
 
   
+
+  
+
+  
+
   
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Scegli un server X (configura la tua scheda video)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-xml:id="configureX_card_list-im1" fileref="dx2-configureX_card_list.png"
-format="PNG"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX possiede un vasto database di schede video e di solito identifica
 correttamente il dispositivo video.</para>
@@ -27,33 +42,34 @@ correttamente il dispositivo video.</para>
   <para>Se l'installer non ha identificato correttamente la tua scheda video e tu
 sai di quale si trtta puoi selezionarla dall'elenco: <itemizedlist>
       <listitem>
-        <para>venditore</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>poi il nome della tua scheda</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>e il tipo di scheda</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-Xorg category</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>The Xorg listing provides more than 40 generic and open source video card
-drivers. If you still can't find a named driver for your card there is the
-option of using the vesa driver which provides basic capabilities.</para>
-
-  <para>Attento che selezionando un driver incompatibile potresti avere accesso alla
-sola interfaccia da linea di comando.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the Nonfree repository and in some cases only from
-the card manufacturers' websites.</para>
-
-  <para>The Nonfree repository needs to be explicitly enabled to access them.  If
-you didn't select it previously, you should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/it/configureX_chooser.xml b/docs/docs/stable/installer/it/configureX_chooser.xml
index 3badec78..d1f932b5 100644
--- a/docs/docs/stable/installer/it/configureX_chooser.xml
+++ b/docs/docs/stable/installer/it/configureX_chooser.xml
@@ -1,64 +1,92 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="it">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Scheda video e configurazione del monitor</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata revision="1" fileref="dx2-configureX_chooser.png"
-align="center" format="PNG" xml:id="configureX_chooser-im1"> </imagedata>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or
-any other graphical environment to work well, the following
-<acronym>X</acronym> settings need to be correct. Choose the correct
-settings if you can see that <application>DrakX</application> didn't make a
-choice, or if you think the choice is incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis><guibutton>Scheda video</guibutton></emphasis>: Scegli la tua
-scheda video dalla lista se necessario.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor
-from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel>
-list. Choose <guilabel>Custom</guilabel> if you prefer to manually set the
-horizontal and vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para revision="1" xml:id="configureX_chooser-pa3a">Una refresh rate scorretta potrebbe danneggiare il monitor.</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis><guibutton>Risoluzione</guibutton></emphasis>: Imposta la
-risoluzione desiderata e la profondità di colore.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the button is there, you can control your
-settings by pressing it. If you see a question asking you whether your
-settings are correct, you can answer "yes", and the settings will be
-kept. If you don't see anything, you'll return to the configuration screen
-and be able to reconfigure everything until the test is good. <emphasis>Make
-sure your settings are on the safe side if the test button isn't
-available</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to
-enable or disable various options.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
 </section>
diff --git a/docs/docs/stable/installer/it/configureX_monitor.xml b/docs/docs/stable/installer/it/configureX_monitor.xml
index 11fe7c34..8d3d8adb 100644
--- a/docs/docs/stable/installer/it/configureX_monitor.xml
+++ b/docs/docs/stable/installer/it/configureX_monitor.xml
@@ -14,11 +14,17 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
-<!-- lproof -->
+<!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Scegliere proprio monitor</title>
   </info>
 
@@ -26,58 +32,73 @@
 identificherà correttamente il tuo.</para>
 
   <warning>
-    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis>Selecting a monitor with different characteristics could damage
-your monitor or video hardware. Please don't try something without knowing
-what you are doing.</emphasis> If in doubt you should consult your monitor
-documentation</para>
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
+could damage your monitor or video hardware. Please don't try something
+without knowing what you are doing.</emphasis> If in doubt you should
+consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
 format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa2"><emphasis>Personalizzatp</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Personalizzato</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters, the vertical refresh
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
 rate and the horizontal sync rate. Vertical refresh determines how often the
 screen is refreshed and horizontal sync is the rate at which scan lines are
 displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
+        <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
 type with a sync range that is beyond the capabilities of your monitor: you
 may damage your monitor. If in doubt, choose a conservative setting and
 consult your monitor documentation.</para>
+      </listitem>
+    </varlistentry>
 
-  <para revision="1" xml:id="configureX_monitor-pa5"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para revision="1" xml:id="configureX_monitor-pa6">Questa è l'opzione di default e prova a determinare il monitor in base al
-database dei monitor.</para>
-
-  <para revision="1"
-  xml:id="configureX_monitor-pa7"><emphasis>Venditore</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
-one you have, you can select it from the tree by selecting: <itemizedlist>
       <listitem>
-        <para>venditore</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>Il nome del produttore del monitor</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>la descrizione del monitor</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can select it from the tree by selecting:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para revision="1"
-  xml:id="configureX_monitor-pa9"><emphasis>Generico</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para revision="1" xml:id="configureX_monitor-pa10">selecting this group displays nearly 30 display configurations such as
-1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the Vesa card driver
-when your video hardware cannot be determined automatically. Once again it
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
 may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 </section>
diff --git a/docs/docs/stable/installer/it/diskPartitioning.xml b/docs/docs/stable/installer/it/diskPartitioning.xml
new file mode 100644
index 00000000..8ded6fc0
--- /dev/null
+++ b/docs/docs/stable/installer/it/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="it" version="5.0" xml:lang="it">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/diskdrake.xml b/docs/docs/stable/installer/it/diskdrake.xml
index 2bb4a7b4..458848b8 100644
--- a/docs/docs/stable/installer/it/diskdrake.xml
+++ b/docs/docs/stable/installer/it/diskdrake.xml
@@ -1,51 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" 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" version="5.0" xml:lang="it" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Partizionamento personalizzato con DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
+
   <warning>
-    <para revision="3" xml:id="diskdrake-pa1">Se desideri utilizzare una criptazione per la tua partizione
-<literal>/</literal> devi prima assicurarti di avere una partizione
-<literal>/boot</literal> separata. L'opzione di criptazione per la partizion
-<literal>/boot</literal> NON deve essere impostata, altrimenti il sistema
-non sarà avviabile.</para>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
   </warning>
-  <para xml:id="diskdrake-pa3" revision="2">Adjust the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view what is in them before you start.</para>
-  <para xml:id="diskdrake-pa4" revision="1">C'è una tab per ogni hard disk individuato o altro dispositivo di storage
-(come, per esempio, una chiavetta usb). Per esempio sda, sdb e sdc se ce ne
-sono tre. </para>
-  <para xml:id="diskdrake-pa5" revision="1">Premi <guibutton>Cancella tutto</guibutton> per cancellare tutte le
-partizioni sul dispositivo di storage selezionato.</para>
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert
-mode</guibutton>) gives some more tools like to add a label or to choose a
-partition type. </para>
-  <para xml:id="diskdrake-pa6a" revision="1">Continua sino a quando non avrai impostato tutto come desideri.</para>
-  <para xml:id="diskdrake-pa7" revision="1">Quando hai completato premi <guibutton>Finito</guibutton> </para>
-  <note>
-    <para>If you are installing Mageia on an UEFI system, check that an ESP (EFI
-System Partition) is present and correctly mounted on /boot/EFI (see below)</para>
-    <para><mediaobject><imageobject condition="classical"><imagedata fileref="dx2-diskdrake2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-align="center" fileref="live-diskdrake2.png"/></imageobject></mediaobject></para>
-  </note>
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
-    <mediaobject>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
+
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
+
+  <figure>
+    <title>EFI System Partition</title>
+
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
+
+  <figure>
+    <title>BIOS boot partition</title>
+
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/it/doPartitionDisks.xml b/docs/docs/stable/installer/it/doPartitionDisks.xml
index f31c1098..734e2b1e 100644
--- a/docs/docs/stable/installer/it/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/it/doPartitionDisks.xml
@@ -1,84 +1,214 @@
-<?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:lang="it" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
+  
+
+  
+
+  
+
   
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
 
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Partizionamento</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) and see the
-solutions the DrakX partitioning wizard found for where to install
-<application>Mageia</application>.</para>
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from the list below will vary depending on your
-particular hard drive(s) layout and content.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist><listitem><para revision="1" xml:id="doPartitionDisks-pa4">Utilizza le partizioni esistenti</para><para xml:id="doPartitionDisks-pa5" revision="1">Se questa opzione è disponibile allora saranno trovate partizioni esistenti
-Linux compatibili e potrebbero essere usate per l'installazione.</para></listitem><listitem><para xml:id="doPartitionDisks-pa6" revision="1">Utilizza lo spazio libero</para><para xml:id="doPartitionDisks-pa7" revision="1">Se hai dello spazio libero sul tuo hard drive questa opzione lo utilizzerà
-per la tua nuova installazione di Mageia.</para></listitem><listitem><para xml:id="doPartitionDisks-pa8" revision="1">Usa lo spazio libero di una partizione Windows</para><para xml:id="doPartitionDisks-pa9" revision="1">Se hai dello spazio libero su di una partizione Windows esistente
-l'installer potrebbe offrirti di utilizzarla.</para><para xml:id="doPartitionDisks-pa10" revision="2">This can be a useful way of making room for your new Mageia installation,
-but is a risky operation so you should make sure you have backed up all
-important files!</para><para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa5">Se questa opzione è disponibile allora saranno trovate partizioni esistenti
+Linux compatibili e potrebbero essere usate per l'installazione.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa7">Se hai dello spazio libero sul tuo hard drive questa opzione lo utilizzerà
+per la tua nuova installazione di Mageia.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
+
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
+
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
 partition must be "clean", meaning that Windows must have closed down
 correctly the last time it was used. It must also have been defragmented,
 although this is not a guarantee that all files in the partition have been
 moved out of the area that is about to be used. It is highly recommended to
-back up your personal files.</para><para>With this option, the installer displays the remaining Windows partition in
-light blue and the future Mageia partition in dark blue with their intended
-sizes just under. You have the possibility to adapt these sizes by clicking
-and dragging the gap between both partitions. See the screen-shot below.</para><mediaobject><imageobject condition="classical"><imagedata
-fileref="dx2-doPartitionDisks2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-fileref="live-doPartitionDisks2.png" align="center"/></imageobject></mediaobject></listitem></itemizedlist> <itemizedlist><listitem><para xml:id="doPartitionDisks-pa12" revision="1">Formatta e utilizza tutto il disco</para><para xml:id="doPartitionDisks-pa13" revision="1">Questa opzione userà l'intero disco per Mageia.</para><para xml:id="doPartitionDisks-pa14" revision="1">Nota bene! Questo cancellerà TUTTI i dati sull'hard drive selezionato. Fai
-attenzione!</para><para xml:id="doPartitionDisks-pa15" revision="1">If you intend to use part of the disk for something else, or you already
-have data on the drive that you are not prepared to lose, then do not use
-this option.</para></listitem></itemizedlist><itemizedlist><listitem><para xml:id="doPartitionDisks-pa16" revision="1">Custom disk partitioning</para><para xml:id="doPartitionDisks-pa17" revision="1">This gives you complete control over the placing of the installation on your
-hard drive(s).</para></listitem></itemizedlist></para>
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
-  <para>The installer will share the available place out according to the following
-rules:</para>
-  <para><itemizedlist><listitem><para>If the total available place is lower than 50 GB, only one partition is
-created for /, there is no separate partition for /home.</para></listitem><listitem><para>If the total available place is over 50 GB, then three partitions are
-created</para><itemizedlist><listitem><para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para></listitem><listitem><para>1/19 is allocated to swap with a maximum of 4 GB</para></listitem><listitem><para>the rest (at least 12/19) is allocated to /home</para></listitem></itemizedlist></listitem></itemizedlist></para>
-  <para>That means that from 160 GB and over of available place, the installer will
-create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.</para>
+back up your personal files.</para>
+      </important>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa17">This gives you complete control over the placing of the installation on your
+hard drive(s).</para>
+    </listitem>
+  </itemizedlist>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
+
   <note>
-    <para>If you are using an UEFI system, the ESP (EFI System Partition) will be
-automatically detected, or created if it does not exist yet, and mounted on
-/boot/EFI. The "Custom disk partitioning" option is the only one that allows
-to check it has been correctly done</para>
+    <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
-  <note>
-    <para>If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk,
-you need to create a Bios boot partition if not already existing. It is an
-about 1 MiB partition with no mount point. Choose <xref
-linkend="diskdrake"/> to be able to create it with the Installer like any
-other partition, just select BIOS boot partition as filesystem type.</para>
-    <mediaobject>
+
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
-  <warning>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
+
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
-previous standard of 512 byte logical sectors. Due to lack of available
-hardware, the partitioning tool used in the installer has not been tested
-with such a drive. Also some ssd drives now use an erase block size over 1
-MB. We suggest to pre-partition the drive, using an alternative partitioning
-tool like gparted, if you own such a device, and to use the following
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
 settings:</para>
-    <para>"Align to" "MiB"</para>
-    <para>"Free space preceding (MiB)" "2"</para>
-    <para>Assicurati anche che tutte le partizioni siano create con un numero pari di
-megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Also make sure all partitions are created using an even number of megabytes.</para>
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/it/exitInstall.xml b/docs/docs/stable/installer/it/exitInstall.xml
index 72b1f2e1..3dabcc1e 100644
--- a/docs/docs/stable/installer/it/exitInstall.xml
+++ b/docs/docs/stable/installer/it/exitInstall.xml
@@ -1,19 +1,32 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xml:id="exitInstall" version="5.0" xml:lang="it">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0" xml:lang="it">
   <info>
     <title xml:id="exitInstall-ti1">Complimenti</title>
   </info>
+
   
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
-  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring
-<application>Mageia</application> and it is now safe to remove the
-installation medium and reboot your computer.</para>
-  <para xml:id="exitInstall-pa2" revision="2">Dopo il riavvio, nella schermata del bootloader, potrai scegliere fra i
-diversi sistemi operativi del tuo computer (se ne possiedi più di uno).</para>
+
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
+
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
+
   <para xml:id="exitInstall-pa3" revision="1">Se non modifichi le impostazioni del tuo bootloader la tua installazione di
 Mageia verrà automaticamente selezionata e avviata.</para>
+
   <para xml:id="exitInstall-pa4" revision="1">Divertiti!</para>
-  <para xml:id="exitInstall-pa5" revision="1">Visita www.mageia.org se hai delle domande o se vuoi contribuire a Mageia</para>
+
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/firewall.xml b/docs/docs/stable/installer/it/firewall.xml
index 0dada50a..37d08f20 100644
--- a/docs/docs/stable/installer/it/firewall.xml
+++ b/docs/docs/stable/installer/it/firewall.xml
@@ -1,33 +1,37 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="it">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="it" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Firewall</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Firewall</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows to configure some simple firewall rules: they determine
-which type of message from the Internet will be accepted by the target
-system. This, in turn, allows the corresponding services on the system to be
-accessible from the Internet.</para>
+  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+determine which type of message from the Internet will be accepted by the
+target system. This, in turn, allows the corresponding services on the
+system to be accessible from the Internet.</para>
 
-  <para>In the default setting, no button is checked - no service of the system is
-accessibly from the network. The "<emphasis>Everything (no
-firewall)</emphasis>" button has a particular role: it enables access to all
-services of the machine - an option that does not make much sense in the
-context of the installer since it would create a totally unprotected
-system.  Its veritable use is in the context of the Mageia Control Center
-(which uses the same GUI layout) for temporarily disabling the entire set of
-firewall rules for testing and debugging purposes.</para>
+  <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
 
-  <para>All other checkbuttons are more or less self-explanatory. As an example, you
-will check the "CUPS server" button if you want printers on your machine to
-be accessible from the network.</para>
+  <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The set of checkbuttons only comprises the most common services. The
-"Advanced" button allows to enable messages that correspond to a service for
-which no checkbutton exists. The "<emphasis>Advanced</emphasis>" button
-opens a window where you can enable a series of services by typing a list of
-couples (blank separated)</para>
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
 
diff --git a/docs/docs/stable/installer/it/formatPartitions.xml b/docs/docs/stable/installer/it/formatPartitions.xml
index 3ada15d7..b9b59ce0 100644
--- a/docs/docs/stable/installer/it/formatPartitions.xml
+++ b/docs/docs/stable/installer/it/formatPartitions.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="formatPartitions">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formattazione in corso</title>
   </info>
@@ -7,41 +13,41 @@
   
 
   
+
   
+
   
+
   
-  
-  
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition='classical'> <imagedata revision="1"
-fileref="dx2-formatPartitions.png" format="PNG" align="center"
-xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
-condition='live'> <imagedata revision="1"
-fileref="live-formatPartitions.png" format="PNG" align="center"
-xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="formatPartitions-pa1">Qua puoi scegliere quale/i partizione/i desideri formattare. Ogni dato nelle
-partizioni <emphasis>non</emphasis> contrassegnate per la formattazione
-verrà salvato.</para>
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
+partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa2">Usually at least the partitions DrakX selected, need to be formatted</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para revision="1" xml:id="formatPartitions-pa3">Clicca su <guibutton>Avanzato</guibutton> per scegliere le partizioni che
-desideri controllare per i cosiddetti <emphasis>bad blocks</emphasis>.</para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
     <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen.
-In that screen you can choose to view what is in your partitions.</para>
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para revision="1" xml:id="formatPartitions-pa5">Quando sei sicuro di ciò che hai selezionato clicca su
-<guibutton>Avanti</guibutton> per proseguire.</para>
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
 </section>
diff --git a/docs/docs/stable/installer/it/graphicalConfiguration.xml b/docs/docs/stable/installer/it/graphicalConfiguration.xml
new file mode 100644
index 00000000..9ae4a72f
--- /dev/null
+++ b/docs/docs/stable/installer/it/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/it/installUpdates.xml b/docs/docs/stable/installer/it/installUpdates.xml
index a2e577c0..483556c2 100644
--- a/docs/docs/stable/installer/it/installUpdates.xml
+++ b/docs/docs/stable/installer/it/installUpdates.xml
@@ -1,31 +1,46 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="it">
+  
 
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="installUpdates"><info><title xml:id="installUpdates-ti1">Aggiornamenti</title></info>
+  
 
+  
 
+  
 
+  
 
- 
- 
- 
+  
 
-   <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-installUpdates.png"
-format="PNG" align="center" xml:id="installUpdates-im1"></imagedata>
-</imageobject></mediaobject> 
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Aggiornamenti</title>
+  </info>
 
- <para revision="1" xml:id="installUpdates-pa1">Since this version of <application>Mageia</application> was released, some
-packages will have been updated or improved.</para>
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
+align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="installUpdates-pa2">Choose <guilabel>yes</guilabel> if you wish to download and install them,
-select <guilabel>no</guilabel> if you don't want to do this now, or if you
-aren't connected to the Internet</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para revision="1" xml:id="installUpdates-pa3">Poi premi <guibutton>Avanti</guibutton> per continuare</para>
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+    </listitem>
 
-</section>
-  
\ No newline at end of file
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/installer.xml b/docs/docs/stable/installer/it/installer.xml
index e33759c0..e63d3336 100644
--- a/docs/docs/stable/installer/it/installer.xml
+++ b/docs/docs/stable/installer/it/installer.xml
@@ -1,167 +1,169 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="installer">
-  <info>
-    <title xml:id="Select-and-use-ISOs-ti1">DrakX, l'assistente all'installazione di Mageia</title>
-  </info>
-
-  <para>Che tu sia un nuovo utente GNU-Linux o un esperto, l'installer di Mageia è
-studiato per rendere la tua installazione o aggiornamento il più semplice
-possibile.</para>
-
-  <para>Il menù iniziale ha diverse opzioni, in ogni caso quella di default avvierà
-l'installer che è normalmente tutto ciò di cui hai bisogno.</para>
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="installer"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
 
-  <section>
-    <title>Schermata di benvenuto dell'installazione</title>
+  
 
-    <section>
-      <title>Using a Mageia DVD</title>
+  
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-with an UEFI system and the second one with a Legacy system:</para>
+  
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, you can access to options by pressing the "e" letter to
-enter the "edit mode". To come back to this screen, press either the key
-"esc" to quit without saving or press the key "Ctrl" or "F10" to quit with
-saving.</para>
-
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
+  
 
-      <para>From this screen, it is possible to set some personal preferences:<itemizedlist>
-          <listitem>
-            <para>La lingua (per la sola installazione, può essere diversa da quella scelta
-per il sistema) premendo il tasto F2 (solo nella modalità Legacy).</para>
+  
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
+  
 
-            <para>Usa le frecce per scegliere la lingua e premi il tasto Invio.</para>
+  
 
-            <para>Here is for example, the French welcome screen when using a Live
-DVD/CD. Note that the Live DVD/CD menu does not propose: <guilabel>Rescue
-System</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware
-Detection Tool</guilabel>.</para>
+  
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome4fr.png"/> </imageobject></mediaobject>
-          </listitem>
+  
 
-          <listitem>
-            <para>Cambia la risoluzione premendo F3 (solo nella modalità Legacy).</para>
+  <info>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, l'assistente all'installazione di Mageia</title>
+  </info>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
+  <para>Che tu sia un nuovo utente GNU-Linux o un esperto, l'installer di Mageia è
+studiato per rendere la tua installazione o aggiornamento il più semplice
+possibile.</para>
 
-          <listitem>
-            <para>Add some kernel options by pressing the <emphasis role="bold">F6</emphasis>
-key for the legacy mode or the <emphasis role="bold">e</emphasis> key for
-the UEFI mode.</para>
+  <section>
+    <title>I passi dell'installazione</title>
 
-            <para>If the installation fails, then it may be necessary to try again using one
-of the extra options. The menu called by F6 displays a new line called
-<guilabel>Boot options</guilabel> and propose four entries:</para>
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
-            <para>- Default, non cambia niente nelle opzioni di default.</para>
+  <section>
+    <title>Schermata di benvenuto dell'installazione</title>
 
-            <para>- Default, non cambia niente nelle opzioni di default.</para>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-            <para>- No ACPI (Advanced Configuration and Power Interface), power management
-isn't taken into account.</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
 
-            <para>- No Local APIC (Local Advanced Programmable Interrupt Controller), it is
-about CPU interruptions, select this option if you are asked for.</para>
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
-            <para>When you select one of these entries, it modifies the default options
-displayed in the <guilabel>Boot Options</guilabel> line.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with the
-key F6 does not appear in the <guilabel>Boot Options</guilabel> line,
-however, they are really taken into account.</para>
-            </note>
+      <itemizedlist>
+        <title>Menu</title>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
 
-          <listitem>
-            <para>Aggiungi ulteriori opzioni kernel premendo il tasto F1 (solo nella modalità
-Legacy).</para>
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
 
-            <para>Pressing F1 opens a new window with more available options.  Select one with
-the arrow keys and press Enter to have more details or press the Esc key to
-go back to the welcome screen.</para>
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
 
-            <para>The detailed view about the option splash. Press Esc or select
-<guilabel>Return to Boot Options</guilabel> to go back to the options
-list. These options can by added by hand in the <guilabel>Boot
-options</guilabel> line.</para>
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
 
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
 
-            <note>
-              <para>L'aiuto viene tradotto nella lingua scelta con il tasto F2.</para>
-            </note>
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
 
-            <para>Per maggiori informazioni riguardo le opzioni del kernel su sistemi legacy e
-UEFI visitare: <link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
 
     <section>
-      <title>Using a Wired Network</title>
-
-      <para>Here is the default welcome screen when using a Wired Network-based
-Installation CD (netinstall.iso or netinstall-nonfree.iso images):</para>
+      <title>UEFI Systems</title>
 
-      <para>It does not allow to change the language, the available options are
-described in the screen. For more information about using a Wired
-Network-based Installation CD, see <link
-ns2:href="https://wiki.mageia.org/en/Boot.iso_install">the Mageia
-Wiki</link></para>
-
-      <warning>
-        <para>La mappatura della tastiera è quella americana.</para>
-      </warning>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
       <mediaobject>
-<imageobject> <imagedata fileref="../dx-help.png"/> </imageobject></mediaobject>
-    </section>
-  </section>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-  <section>
-    <title>I passi dell'installazione</title>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <para>Il processo di installazione è diviso in step che possono essere seguiti sul
-pannello a lato dello schermo.</para>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
 
-    <para>Ogni step ha una o più schermate e può anche avere un pulsate
-<guibutton>Avanzate</guibutton>  con degli extra con le opzioni meno
-richieste.</para>
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
 
-    <para>Molte schermate hanno un bottone di <guilabel>Aiuto</guilabel> per darti
-ulteriori spiegazioni riguardo lo step corrente.</para>
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
 
-    <note>
-      <para>If somewhere during install you decide to stop the installation, it is
-possible to reboot, but please think twice before you do this.  Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -172,17 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>After the initial screen you did not reach the language selection
-screen. This can happen with some graphic cards and older systems. Try using
-low resolution by typing <code>vgalo</code> at the prompt.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this hit ESC at the first welcome screen and confirm with ENTER. You will be
-presented with a black screen with the word "boot:". Type "text" and hit
-ENTER. Now continue with the installation in text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -191,31 +196,30 @@ ENTER. Now continue with the installation in text mode.</para>
       <title>L'installazione si blocca</title>
 
       <para>If the system appeared to freeze during the installation, this may be a
-problem with hardware detection. In this case the automatic detection of
-hardware may be bypassed and dealt with later. To try this, type
-<code>noauto</code> at the prompt. This option may also be combined with
-other options as necessary.</para>
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
       <title>Problema relativo alla RAM</title>
 
-      <para>These will rarely be needed, but in some cases the hardware may report the
+      <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Partizioni dinamiche</title>
 
-      <para>If you converted your hard disk from "basic" format to "dynamic" format on
-Microsoft Windows, you must know that it is impossible to install Mageia on
-this disc. To go back to a basic disk, see the Microsoft documentation:
-<link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
-
-  <section/>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/it/locale.xml b/docs/docs/stable/installer/it/locale.xml
new file mode 100644
index 00000000..0dac8ec8
--- /dev/null
+++ b/docs/docs/stable/installer/it/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/it/login.xml b/docs/docs/stable/installer/it/login.xml
index aaeb54f8..c2ef33db 100644
--- a/docs/docs/stable/installer/it/login.xml
+++ b/docs/docs/stable/installer/it/login.xml
@@ -1,5 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="it"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
-yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para><para>Puoi trovarli <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">qui</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="it">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/media_selection.xml b/docs/docs/stable/installer/it/media_selection.xml
index db6ba655..7b0192aa 100644
--- a/docs/docs/stable/installer/it/media_selection.xml
+++ b/docs/docs/stable/installer/it/media_selection.xml
@@ -1,18 +1,31 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="it">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Selezione media (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
+
   
+
   
+
   
 
-<mediaobject>
+  
+  
+  <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
 <imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
 format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
@@ -31,7 +44,7 @@ the base of the distribution.</para>
       <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
 free-of-charge, i.e. Mageia may redistribute them, but they contain
 closed-source software (hence the name - Nonfree). For example this
-repository includes nVidia and ATI graphics card proprietary drivers,
+repository includes nVidia and AMD graphics card proprietary drivers,
 firmware for various WiFi cards, etc.</para>
     </listitem>
 
@@ -39,8 +52,8 @@ firmware for various WiFi cards, etc.</para>
       <para>The <emphasis>Tainted</emphasis> repository includes packages released under
 a free license. The main criteria for placing packages in this repository is
 that they may infringe patents and copyright laws in some countries,
-e.g. Multimedia codecs needed to play various audio/video files; packages
-needed to play commercial video DVD, etc.</para>
+e.g. multimedia codecs needed to play various audio/video files; packages
+needed to play commercial video DVD's, etc.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/it/minimal-install.xml b/docs/docs/stable/installer/it/minimal-install.xml
index ef3b478b..3ae287e1 100644
--- a/docs/docs/stable/installer/it/minimal-install.xml
+++ b/docs/docs/stable/installer/it/minimal-install.xml
@@ -1,48 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="it" xml:id="minimal-install"
-         xmlns="http://docbook.org/ns/docbook"
-	 xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/1999/xlink"
-         xmlns:ns3="http://www.w3.org/2000/svg"
-         xmlns:ns="http://docbook.org/ns/docbook">
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="it">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Installazione minimale</title>
   </info>
 
   
+
+  
+
+  
+
+  
+
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref
-linkend="choosePackageGroups"></xref>.</para>
-  <para>If desired, you can additionally tick the "Individual package selection"
-option in the same screen.</para>
   <para>Minimal Installation is intended for those with specific uses in mind for
-their <application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the "Individual
-package selection" option mentioned above, to fine-tune your installation,
-see <xref linkend="choosePackagesTree"></xref>.</para>
-  <para>If you choose this installation class, then the related screen will offer
-you a few useful extras to install, such as documentation and X.</para>
-  <para>If selected, "With X" will also include IceWM as lightweight desktop
-environment.</para>
-  <para>The basic documentation is provided in the form of man and info pages.  It
-contains the man pages from the <link
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
 Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
 coreutils</link> info pages.</para>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" fileref="dx2-minimal-install.png"
-align="center" format="PNG" xml:id="minimal-install-im1"></imagedata>
+<imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
+align="center" fileref="dx2-minimal-install.png" revision="1"/>
 </imageobject></mediaobject>
-
-  </section>
-
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/misc-params.xml b/docs/docs/stable/installer/it/misc-params.xml
index 47b33cc9..b80090c5 100644
--- a/docs/docs/stable/installer/it/misc-params.xml
+++ b/docs/docs/stable/installer/it/misc-params.xml
@@ -1,22 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Sommario di vari parametri</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
-
-  <para xml:id="misc-params-pa1" revision="1">DrakX fa scelte intelligenti per la configurazione del tuo sistema in base
-alle scelte da te fatte e dall'hardware che DrakX ha individuto. Puoi
-controllare le impostazioni e cambiarle se lo desideri premendo
-<guibutton>Configura</guibutton>.</para>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+  <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
 
   <note>
-    <para>As a general rule, default settings are recommended and you can keep them
-with 3 exceptions:<itemizedlist>
+    <para>As a general rule, it is recommended that you accept the default settings
+unless:<itemizedlist>
         <listitem>
           <para>there are known issues with a default setting</para>
         </listitem>
@@ -26,7 +42,7 @@ with 3 exceptions:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>something else is said in the detailed sections below</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,48 +54,47 @@ with 3 exceptions:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Fuso orario</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX ha automaticamente selezionato una time zone in base alla tua
-lingua. Puoi effettuare dei cambiamenti se lo desideri. Guarda anche <xref
-linkend="configureTimezoneUTC"/></para>
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Paese / Regione</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
-        <para xml:id="misc-params-system-pa3a" revision="1">Se non ti trovi nel Paese selezionato è molto importante che tu corregga le
-impostazioni. Guarda <xref linkend="selectCountry"/></para>
+        <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
+setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Bootloader</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX ha fatto buone scelte per le impostazioni del bootloader.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure Grub2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Per ulteriori informazioni, consulta <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Gestione dell'utente</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Puoi aggiungere ulteriori utenti qua. Ognuno di loro avrà una sua cartella
-<literal>/home</literal>.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Servizi</guilabel>:</para>
-
-        <para xml:id="misc-params-system-pa6a" revision="1">I servizi di sistema sono quei piccoli programmi che lavorano in background
-(demoni). Questo strumentio ti permette di abilitare o disabilitare certi
-task.</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Dovresti controllare bene prima di cambiare qualcosa qua - un errore
-potrebbe impedire al tuo computer di lavorare correttamente.</para>
+        <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
+(daemons).  This tool allows you to enable or disable certain processes.</para>
 
-        <para>Per ulteriori informazioni, consulta <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -91,10 +106,10 @@ potrebbe impedire al tuo computer di lavorare correttamente.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Tastiera</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa1a" revision="1">This is where you setup or change your keyboard layout which will depend on
-your location, language or type of keyboard.</para>
+        <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
+of keyboard.</para>
 
         <note>
           <para>If you notice a wrong keyboard layout and want to change it, keep in mind
@@ -103,27 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Mouse</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add or configure other pointing devices, tablets, trackballs
 etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Scheda audio</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver, if there is a default one. The option
-to select a different driver is only given when there is more than one
-driver for your card, but none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Interfaccia grafica</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphic card(s) and displays.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Per ulteriori informazioni, consulta <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -138,27 +158,28 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Rete</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
-        <para xml:id="misc-params-network-pa2" revision="1">Puoi configurare la tua rete qua, ma per le schede di rete con driver
-proprietari è meglio farlo dopo il riavvio. Nel <application>Mageia Control
-Center</application> se non hai abilitato i repository Nonfree.</para>
+        <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
+repositories.</para>
 
         <warning>
-          <para xml:id="misc-params-network-pa3" revision="1">When you add a network card, do not forget to set your firewall to watch
+          <para xml:id="misc-params-network-pa3" revision="1">When you add a network card, do not forget to set your firewall to monitor
 that interface as well.</para>
         </warning>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxy</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">Un Proxy Server si comporta come un intermediario fra il tuo computer e il
-vasto internet. Questa sezione ti permette di configurare il tuo computer
-per utilizzare un servizio proxy.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">Potrebbe essere necessario consultare l'amministratore di sistema per
-ottenere i parametri che necessiti inserire qua</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -170,27 +191,31 @@ ottenere i parametri che necessiti inserire qua</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Livello di sicurezza</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Qua puoi impostare il livello di sicurezza per il tuo computer. Nella
-maggior parte dei casi l'impostazione di default (Standard) è adeguata per
-un uso generale.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Spunta l'opzione che meglio si combina al tuo utilizzo.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Firewall</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">Un firewall è inteso come una barriera fra i tuoi dati importanti e i
-mascalzoni in internet che potrebbero comprometterli o rubarli.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing everything (no firewall) may be very risky.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/it/reboot.xml b/docs/docs/stable/installer/it/reboot.xml
index 1f64e34d..1cfda805 100644
--- a/docs/docs/stable/installer/it/reboot.xml
+++ b/docs/docs/stable/installer/it/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="it" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Riavvia</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/it/securityLevel.xml b/docs/docs/stable/installer/it/securityLevel.xml
index c0d8c04d..83da5f09 100644
--- a/docs/docs/stable/installer/it/securityLevel.xml
+++ b/docs/docs/stable/installer/it/securityLevel.xml
@@ -1,33 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="securityLevel" version="5.0" xml:lang="it">
+<section version="5.0" xml:lang="it" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="securityLevel-ti1">Livello di sicurezza</title>
+  </info>
 
+  
 
-    <info>
-      <title xml:id="securityLevel-ti1">Livello di sicurezza</title>
-    </info>
+  
 
- 
- 
+  
 
-<mediaobject>
+  <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-securityLevel.png"
-align="center" format="PNG" xml:id="securityLevel-im1"></imagedata>
-</imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
-    <para revision="1" xml:id="securityLevel-pa1">Puoi impostare il tuo livello di sicurezza qua.</para>
+  <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-    <para revision="1" xml:id="securityLevel-pa2">Lascia le impostazioni di default come sono se non sai cosa scegliere.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
 
-    <para revision="2" xml:id="securityLevel-pa3">Dopo aver installato sarà sempre possibile modificare le tue impostazioni di
-sicurezza nella sezione <guilabel>Sicurezza</guilabel> del Mageia Control
-Center.</para>
-  </section>
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
+  <para><emphasis role="bold">Security Administrator</emphasis></para>
+
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
+send <emphasis>security alert messages</emphasis> when it detects situations
+which require notification to a system administrator.</para>
+
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
+
+  <note>
+    <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
+messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
+be configured for receiving such mail!</para>
+  </note>
+
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/it/selectCountry.xml b/docs/docs/stable/installer/it/selectCountry.xml
index 58beae2f..8f35c10c 100644
--- a/docs/docs/stable/installer/it/selectCountry.xml
+++ b/docs/docs/stable/installer/it/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="it">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="it">
   <info>
     <title xml:id="selectCountry-ti1">Seleziona il tuo paese/regione</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">Se il tuo Paese non è nella lista premi sul pulsante <guilabel>Altri
-Paesi</guilabel> e seleziona il tuo Stato / Regione.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">Se il tuo Paese si trova solo nella lista <guilabel>Altri Paesi</guilabel>
-dopo aver cliccato <guilabel>OK</guilabel> potrebbe sembrare che sia stato
-scelto il Paese dalla prima lista. Per favore ignorate, DrakX seguirà la
-scelta reale.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,18 +40,19 @@ scelta reale.</para>
       <title xml:id="inputMethod-ti7">Metodo di input</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
-manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar
+manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
 functions and can be installed if you added HTTP/FTP media before package
 selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via "Configure your Computer" ->
-"System", or by running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/selectInstallClass.xml b/docs/docs/stable/installer/it/selectInstallClass.xml
index 2b2328ba..9c18f275 100644
--- a/docs/docs/stable/installer/it/selectInstallClass.xml
+++ b/docs/docs/stable/installer/it/selectInstallClass.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- 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="it" xml:id="selectInstallClass">
+<section version="5.0" xml:lang="it" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
 
   
 
@@ -14,6 +15,13 @@
   
 
   
+
+  
+
+  
+
+  
+
   
 
   <info>
@@ -23,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Installa o aggiorna</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectInstallClass.png" align="center"
-format="PNG"></imagedata> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Installa</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Usa questa opzione per un'installazione pulita di
-<application>Mageia</application>.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Aggiorna</para>
-
-      <para>Se hai una o più installazioni di <application>Mageia</application> sul tuo
-sistema questo installer ti permetterà di aggiornare una di queste
-all'ultima release.</para>
-
-<warning>
-	<para>Solo l'aggiornamento da versioni precedenti di Mageia che erano
-<emphasis>ancora supportate</emphasis> quando la versione dell'installer è
-stato rilasciato sono state ben testate.
-Se puoi eseguire un upgrade da una versione di Mageia che non era supportata
-al momento del rilascio è meglio eseguire una nuova installazione
-preservando la partizione <literal>/home</literal></para>
-</warning>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
+
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>Se durante l'installazione decidi di terminarla è possibile eseguire un
-reboot, ma per favore pensaci due volte prima di farlo. Una volta che una
-partizione è stata formattata o l'update ha iniziato a installare il tuo
-computer non è più nello stesso stato e riavviarlo può condurre con buone
-probabilità ad un sistema inutilizzabile. Nel caso in cui tu sia davvero
-sicuro che il riavvio sia ciò che desideri apri un terminale premendo i tre
-tasti <guilabel>Alt Ctrl F2</guilabel> contemporaneamente. Dopo, premere
-insieme <guilabel>Alt Ctrl Delete</guilabel> per riavviare.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
-    <para>Se hai scoperto di aver dimenticato di selezionare una lingua addizionale
-puoi tornare dalla schermata "Installa o aggiorna" alla scelta della lingua
-premendo <guilabel>Alt Ctrl Home</guilabel>. <emphasis>NON</emphasis> farlo
-successivamente durante l'installazione.</para>
+    <para>If you have discovered that you forgot to select an additional language, you
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
 </section>
diff --git a/docs/docs/stable/installer/it/selectKeyboard.xml b/docs/docs/stable/installer/it/selectKeyboard.xml
index 6430a132..cb6a7fca 100644
--- a/docs/docs/stable/installer/it/selectKeyboard.xml
+++ b/docs/docs/stable/installer/it/selectKeyboard.xml
@@ -10,9 +10,18 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Tastiera</title>
   </info>
 
@@ -20,7 +29,7 @@
 tastiera adatta non viene trovata verrà impostato di default il layout US.</para>
 
   <mediaobject>
-<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png" />
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
@@ -34,23 +43,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="selectKeyboard-pa3">Se la tua tastiera non è nella lista mostrata premi su
-<guibutton>Altro</guibutton> per avere una lista completa e seleziona quindi
-il tuo layout.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">Dopo aver scelto un layout dalla schermata <guibutton>Altro</guibutton>
-tornerai alla prima schermata di dialogo e sembrerà che la tastiera
-selezionata sia quella. Puoi tranquillamente ignorare questa anomalia e
-continuare l'installazione: la tua tastiera è quella scelta dalla lista
-completa.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para revision="1" xml:id="selectKeyboard-pa4">Se scegli una tastiera con caratteri non-latini vedrai un'ulteriore
-schermata di dialogo che ti chiederà come preferisci cambiare fra layout a
-caratteri latini e non-latini.</para>
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
+extra dialogue screen asking how you would prefer to switch between the
+Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/it/selectKeyboardLive.xml b/docs/docs/stable/installer/it/selectKeyboardLive.xml
index 69195817..cba02dd4 100644
--- a/docs/docs/stable/installer/it/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/it/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Select keyboard</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>You will be required to set the keyboard layout you wish to use in
-Mageia​​. The default one is selected according to your language and
-timezone previously selected.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/it/selectLanguage.xml b/docs/docs/stable/installer/it/selectLanguage.xml
index 834ae393..c5175051 100644
--- a/docs/docs/stable/installer/it/selectLanguage.xml
+++ b/docs/docs/stable/installer/it/selectLanguage.xml
@@ -1,9 +1,33 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="it" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
+
   
+
   
+
   
+
   
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 04 01, using barjac's text -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -12,41 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Scegli una lingua da utilizzare</title>
   </info>
-  <para condition="classical">Select your preferred language, by first expanding the list for your
-continent. <application>Mageia</application> will use this selection during
-the installation and for your installed system.</para>
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
-  <para condition="classical">If it is likely that you will require several languages installed on your
-system, for yourself or other users, then you should use the
-<guibutton>Multiple languages</guibutton> button to add them now. It will be
-difficult to add extra language support after installation.</para>
+
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
+
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
+
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
+
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
-  <warning condition="classical">
-    <para>Even if you choose more than one language, you must first choose one of them
-as your preferred language in the first language screen. It will also be
-marked as chosen in the multiple languages screen .</para>
-  </warning>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
+
   <itemizedlist>
     <listitem condition="classical">
       <para>If your keyboard language is not the same as your preferred language, then
-it is advisable to install the language of your keyboard as well.</para>
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
+
     <listitem>
-      <para>Mageia uses UTF-8 (Unicode) support by default.</para>
-      <para condition="classical">This may be disabled in the "multiple languages" screen if you know that it
-is inappropriate for your language. Disabling UTF-8 applies to all installed
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
 languages.</para>
     </listitem>
+
     <listitem>
-      <para>You can change the language of your system after installation in the Mageia
-Control Center -> System -> Manage localization for your system.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/it/selectMouse.xml b/docs/docs/stable/installer/it/selectMouse.xml
index 01683fbf..209c16f5 100644
--- a/docs/docs/stable/installer/it/selectMouse.xml
+++ b/docs/docs/stable/installer/it/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="it">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Seleziona il mouse</title>
   </info>
@@ -7,26 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Se non sei felice di come il tuo mouse risponde puoi selezionarne uno
 diverso qua.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Di solito, <guilabel>Universal</guilabel> - <guilabel>Ogni PS/2 e USB
-mouse</guilabel> è una buona scelta.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Seleziona <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel>
-per configurare i pulsanti che non funzionano su un mouse con sei o più
-pulsanti.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/it/setupBootloader.xml b/docs/docs/stable/installer/it/setupBootloader.xml
index ea51a776..a0ccc011 100644
--- a/docs/docs/stable/installer/it/setupBootloader.xml
+++ b/docs/docs/stable/installer/it/setupBootloader.xml
@@ -1,228 +1,198 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="it" xml:id="setupBootloader">
+  
+  
+  
+  
   
-
   
-
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Opzioni principali del bootloader</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
-
   <section>
-    <title>Bootloader interface</title>
-
-    <para>By default, Mageia uses exclusively:</para>
-
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-
-    <section>
-      <title>Grub2 on Legacy/MBR and Legacy/GPT systems</title>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-
-      <para>Don't modify the "Boot Device" unless you really know what you are doing.</para>
-    </section>
-
-    <section>
-      <title>Grub2-efi on UEFI systems</title>
-
-      <para>With an UEFI system, the user interface is slightly different as you cannot
-choose between with or without graphical menu</para>
-
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to receive the bootloader
-(Grub2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds grub2-efi. Although it is possible to have
-several ESPs, only one is advised and enough whatever the number of
-operating systems you have.</para>
-
-      <para>Don't modify the "Boot Device" unless you really know what you are doing.</para>
-    </section>
-  </section>
-
-  <section>
-    <title xml:id="setupMageiaBootloader">Using a Mageia bootloader</title>
-
-    <para>By default, according to your system, Mageia writes a new:</para>
-
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard
-drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
-
       <listitem>
-        <para>Grub2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then uncheck the box
-<guilabel>Probe Foreign OS</guilabel></para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
-  </section>
-
-  <section>
-    <title>Usare un bootloader esistente</title>
-
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this help, however in most cases it will involve
-running the relevant bootloader installation program which should detect and
-add it automatically. See the documentation for the operating system in
-question.</para>
-  </section>
-
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-
-    <para>If you don't want a bootable Mageia, but to chain load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
   </section>
-
   <section>
-    <title>Options</title>
-
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>First page</title>
-
-      <para><itemizedlist>
-          <listitem>
-            <para><guilabel>Delay before booting the default image</guilabel>: This text box
-lets you set a delay in seconds before the default operating system is
-started up.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be asked at the boot
-time to select a booting entry or change settings. The username is "root"
-and the password is the one chosen here after.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Password</guilabel>: This text box is where you actually put the
-password</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Password (again)</guilabel>: Retype the password and Drakx will
-check that it matches with the one set above.</para>
-          </listitem>
-
-          <listitem>
-            <para><guilabel>Advanced</guilabel></para>
-
-            <itemizedlist>
-              <listitem>
-                <para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for the power management. It can save energy by
-stopping unused devices, this was the method used before APM. Unchecking it
+      <title>Opzioni principali del bootloader</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
 could be useful if, for example, your computer does not support ACPI or if
 you think the ACPI implementation might cause some problems (for instance
 random reboots or system lockups).</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable SMP</guilabel>: This option enables / disables symmetric
-multiprocessing for multi core processors.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the
-operating system access to the Advanced Programmable Interrupt
-Controller. APIC devices permit more complex priority models, and Advanced
-IRQ (Interrupt Request)  management.</para>
-              </listitem>
-
-              <listitem>
-                <para><guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which
-manages all external interrupts for a specific processor in an SMP system.</para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-        </itemizedlist></para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
-
     <section>
-      <title>Next page</title>
-
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
-
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
-
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist>
-              <listitem>
-                <para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-the boot menu will use. If you click the down triangle you will be offered
-other size and colour depth options.</para>
-              </listitem>
-
-              <listitem>
-                <para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para>
-              </listitem>
-            </itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Usare un bootloader esistente</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Aggiungi o modifica una Boot Menu Entry</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/setupBootloaderAddEntry.xml b/docs/docs/stable/installer/it/setupBootloaderAddEntry.xml
index d3fe1b2c..74b4c324 100644
--- a/docs/docs/stable/installer/it/setupBootloaderAddEntry.xml
+++ b/docs/docs/stable/installer/it/setupBootloaderAddEntry.xml
@@ -1,15 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns5="http://www.w3.org/2000/svg" version="5.0" xml:lang="it" xml:id="setupBootloaderAddEntry">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="setupBootloaderAddEntry">
   
+
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
 
 Lebarhon 2016 12 16 Updated for Mageia 6-->
 <title xml:id="setupBootloaderAddEntry-ti1">Aggiungi o modifica una Boot Menu Entry</title>
   </info>
-  <para>To do that you need to manually edit /boot/grub2/custom.cfg or use the
-software grub-customizer instead (Available in the Mageia repositories).</para>
+
+  <para>To do this you need to manually edit /boot/grub2/custom.cfg or use the
+software <emphasis role="bold">grub-customizer</emphasis> tool instead
+(available in the Mageia repositories).</para>
+
   <note>
-    <para>For more information, see our wiki: <link
+    <para>For more information, see: <link
 ns2:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
   </note>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/setupSCSI.xml b/docs/docs/stable/installer/it/setupSCSI.xml
index bd32f96e..d3a11c44 100644
--- a/docs/docs/stable/installer/it/setupSCSI.xml
+++ b/docs/docs/stable/installer/it/setupSCSI.xml
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1999/xhtml"
- xmlns:ns42="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/1999/xlink"
- xmlns:ns3="http://www.w3.org/2000/svg"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="setupSCSI" version="5.0" xml:lang="it">
-
+<section version="5.0" xml:lang="it" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Installa SCSI</title>
   </info>
 
   
+
   
+
   
+
   
-   
+
   
+
   
+
   
+
   
+
   
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- JohnR - edited 2012-03-03 -->
@@ -30,17 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata revision="1" fileref="dx2-setupSCSI.png"
-format="PNG" align="center" xml:id="setupSCSI-im1"></imagedata>
-</imageobject></mediaobject>
-
-  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX solitamente determina gli hard disks correttamente. Con qualche
-vecchio controller SCSI potrebbe non essere in grado di determinare
-correttamente i driver da usare e di conseguenza, fallire ad individuare
-l'hard disk.</para>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="setupSCSI-pa2">Se dovesse accadere, dovrai dire manualmente a Drakx quale SCSI drive
-possiedi.</para>
+  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
+SCSI controllers it may be unable to determine the correct drivers to use
+and subsequently fail to recognise the drive.</para>
 
-  <para revision="3" xml:id="setupSCSI-pa3">DrakX dovrebbe essere in grado di configurare il drive correttamente.</para>
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
 </section>
diff --git a/docs/docs/stable/installer/it/software.xml b/docs/docs/stable/installer/it/software.xml
new file mode 100644
index 00000000..34856255
--- /dev/null
+++ b/docs/docs/stable/installer/it/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="it" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/it/soundConfig.xml b/docs/docs/stable/installer/it/soundConfig.xml
index 7bf8a9ef..1b99d684 100644
--- a/docs/docs/stable/installer/it/soundConfig.xml
+++ b/docs/docs/stable/installer/it/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="it">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Configurazione audio</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if we have a default
-one.</para>
+  
 
-  <para>The default driver should work without problems. However, if after install
-you do encounter problems, then run <command>draksound</command> or start
-this tool via MCC (Mageia Control Center), by choosing the
-<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound
-Configuration</guilabel> at the top right of the screen.</para>
+  
 
-  <para>Then, in the draksound or "Sound Configuration" tool screen, click on
-<guibutton>Advanced</guibutton> and then on
-<guibutton>Troubleshooting</guibutton> to find very useful advice about how
-to solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Avanzato</title>
     </info>
 
-    <para>Clicking <guibutton>Advanced</guibutton> in this screen, during install, is
-useful if there is no default driver and there are several drivers
-available, but you think the installer selected the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on
-<guibutton>Let me pick any driver</guibutton>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/it/takeOverHdConfirm.xml b/docs/docs/stable/installer/it/takeOverHdConfirm.xml
index 0b9954c9..2fcf9328 100644
--- a/docs/docs/stable/installer/it/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/it/takeOverHdConfirm.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="it" xml:id="takeOverHdConfirm">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Conferma l'hard disk per essere formattato.</title>
   </info>
@@ -7,7 +13,11 @@
   
 
   
+
   
+
+  
+
   
 
   
@@ -19,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition='live'> <imagedata
-fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
-fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
-></imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="takeOverHdConfirm-pa1">Clicca su <guibutton>Precedente</guibutton> se non sei sicuro della tua
-scelta.</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
+choice.</para>
+    </listitem>
 
-  <para revision="1" xml:id="takeOverHdConfirm-pa2">Clicca su <guibutton>Sucessivo</guibutton> se sei sicuro e vuoi cancellare
-ogni partizione, ogni sistema operativo e ogni file da quell'hard disk.</para>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
 </section>
diff --git a/docs/docs/stable/installer/it/testing.xml b/docs/docs/stable/installer/it/testing.xml
index 5d17fb38..4c0d88c6 100644
--- a/docs/docs/stable/installer/it/testing.xml
+++ b/docs/docs/stable/installer/it/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testing Mageia as Live system</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Live mode</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>You get this screen if you selected "Boot Mageia". If not, you get the
-"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Testing hardware</title>
       </info>
 
-      <para>One of the Live mode goals is to test if the hardware is correctly managed
-by Mageia. You can check if all devices have a driver in the Hardware
-section of the Mageia Control Center. You can test the most current devices:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>graphical card: if you see the previous screen, it's already OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webcam:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>printer: configure it and print a test page</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
       </itemizedlist>
 
-      <para>If all is OK for you, you can process to the installation. If not, you can
-leave with the quit button.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>The configuration settings you made here are kept for the installation.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,15 +68,14 @@ leave with the quit button.</para>
         <title xml:id="testing3-ti1">Launch installation</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
-SSD drive, simply click on the icon "Install on Hard Disk". You will get
-this screen, and then the "<link
-linkend="doPartitionDisks">Partitioning</link> step" as for the direct
-installation.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/it/uninstall-Mageia.xml b/docs/docs/stable/installer/it/uninstall-Mageia.xml
index a4b20280..910e1bd0 100644
--- a/docs/docs/stable/installer/it/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/it/uninstall-Mageia.xml
@@ -1,40 +1,48 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="it">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="it" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Disinstallare Mageia</title>
   </info>
 
   
 
-  <section>
-    <title xml:id="uninstall-Mageia-ti2">Come fare</title>
+  
 
-    <para>Se Mageia non ti convince o non riesci ad installarlo correttamente, in
-breve, vuoi sbarazzartene.
-Questo è un tuo diritto e Mageia ti permette di disinstallarla. Questo non
-accade per ogni sistema operativo.</para>
+  <para>If Mageia didn't convince you or you can't install it correctly - in short
+you want get rid of it - that is your right and Mageia also gives you the
+possibility to uninstall. This is not true for every operating system.</para>
 
-    <para>Dopo aver eseguito un backup dei tuoi dati, riavvia il tuo DVD di Mageia e
-seleziona Recupero sistema, quindi, Recupera boot loader di Windows. Al
-prossimo boot, avrai solo Windows senza alcuna opzione di scegliere il tuo
-sistema operativo.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-    <para>To recover the space used by Mageia partitions on Windows, click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code> to access to the partition
-management. You will recognize the Mageia partition because they are labeled
-<guilabel>Unknown</guilabel>, and also by their size and place in the
-disk. Right click on each of these partitions and select
-<guibutton>Delete</guibutton>. The space will be freed.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-    <para>If you are using Windows XP, you can create a new partition and format it
-(FAT32 or NTFS). It will get a partition letter.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
-    <para>If you have Vista or 7, you have one more possibility, you can extend the
-existing partition that is at the left of the freed space.  There are other
-partitioning tools that can be used, such as gparted, available for both
-windows and linux. As always, when changing partitions, be very careful, and
-make sure all important things have been backed up.</para>
-  </section>
-</section>
\ No newline at end of file
+  <para>If you have Vista or 7, you have one more possibility, you can extend the
+existing partition that is at the left of the freed space. There are other
+partitioning tools that can be used, such as <emphasis
+role="bold">gparted</emphasis>, available for both Windows and Linux. As
+always, when changing partitions, be very careful to back up anything
+important to you.</para>
+</section>
diff --git a/docs/docs/stable/installer/it/unused.xml b/docs/docs/stable/installer/it/unused.xml
index a5f196ed..32fcf39a 100644
--- a/docs/docs/stable/installer/it/unused.xml
+++ b/docs/docs/stable/installer/it/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="it" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="it">
   <info>
     <title xml:id="unused-ti1">Keep or delete unused material</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para>In this step, the installer looks for unused locales packages and unused
-hardware packages. Then it proposes you to delete them. It is a good idea to
-accept, except if you prepare an installation which has to run on different
-hardware.</para>
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
+
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>The next step is the copying of files on hard disk. This takes some
-minutes. At the end, you get a blank screen for some time, it's normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/nb/.directory b/docs/docs/stable/installer/nb/.directory
new file mode 100644
index 00000000..49a85bd5
--- /dev/null
+++ b/docs/docs/stable/installer/nb/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2019,1,7,20,2,3
+Version=4
+ViewMode=1
diff --git a/docs/docs/stable/installer/nl/DrakLive-cover.xml b/docs/docs/stable/installer/nl/DrakLive-cover.xml
index dc6c8f61..c92c7540 100644
--- a/docs/docs/stable/installer/nl/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/nl/DrakLive-cover.xml
@@ -1,77 +1,105 @@
-<?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="nl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="nl" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Installatie vanaf een Live-medium</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Januari 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Installatie vanaf een Live-medium</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">De Officiële Documentatie voor Mageia</para>
+      <para role="tagline">De Officiële Documentatie voor Mageia</para>
+
       <mediaobject>
-<imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>De teksten en de screenshots in deze handleiding zijn beschikbaar onder de
+<imageobject><imagedata fileref="../mageia-2013.png"/></imageobject></mediaobject>
+
+      <para>De teksten en de screenshots in deze handleiding zijn beschikbaar onder de
 CC BY-SA 3.0 licentie <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-            </para>
-            <para>Deze handleiding werd geproduceerd met behulp van het <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Deze handleiding werd geproduceerd met behulp van het <link
 ns6:href="http://www.calenco.com">Calenco CMS</link>, ontwikkeld door <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>
-            </para>
-            <para>Ze werd door vrijwilligers in hun vrije tijd geschreven. Neem a.u.b. contact
+ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+      <para>Ze werd door vrijwilligers in hun vrije tijd geschreven. Neem a.u.b. contact
 op met het <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentatie
-Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para> 
+Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para>
     </cover>
   </info>
+
   <article>
     <title>Installatie vanaf een Live-medium</title>
-       <para><note>
-          <para>U zult niet alle installatieschermen zien die in deze handleiding besproken
+
+    <para><note>
+        <para>U zult niet alle installatieschermen zien die in deze handleiding besproken
 worden. Welke schermen u krijgt hangt af van uw systeem en van de keuzes die
 u tijdens het installeren maakt.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/nl/DrakLive.xml b/docs/docs/stable/installer/nl/DrakLive.xml
index 46116386..356384a6 100644
--- a/docs/docs/stable/installer/nl/DrakLive.xml
+++ b/docs/docs/stable/installer/nl/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="nl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="nl" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Installatie vanaf een Live-medium</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Installatie vanaf een Live-medium</title>
 
     <cover>
       <para><note>
@@ -17,10 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link>, ontwikkeld door <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
 
-      <para>Ze werd door vrijwilligers in hun vrije tijd geschreven. Neem a.u.b. contact
-op met het <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentatie
-Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</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>
 
@@ -40,7 +54,12 @@ Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -50,17 +69,18 @@ Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/nl/DrakX-cover.xml b/docs/docs/stable/installer/nl/DrakX-cover.xml
index fcde86da..20045d44 100644
--- a/docs/docs/stable/installer/nl/DrakX-cover.xml
+++ b/docs/docs/stable/installer/nl/DrakX-cover.xml
@@ -1,116 +1,155 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="nl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="nl" xml:id="Quick-Startup"
+      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>Installeren met DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Februari 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Februari 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">De Officiële Documentatie voor Mageia</para>
+      <para role="tagline">De Officiële Documentatie voor Mageia</para>
+
       <mediaobject>
 <imageobject><imagedata fileref="../mageia-2013.png"/></imageobject></mediaobject>
-	    <para>De teksten en de screenshots in deze handleiding zijn beschikbaar onder de
+
+      <para>De teksten en de screenshots in deze handleiding zijn beschikbaar onder de
 CC BY-SA 3.0 licentie <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-	    </para>
-	    <para>Deze handleiding werd geproduceerd met behulp van het <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Deze handleiding werd geproduceerd met behulp van het <link
 ns6:href="http://www.calenco.com">Calenco CMS</link>, ontwikkeld door <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>
-	    </para>
-            <para>Ze werd door vrijwilligers in hun vrije tijd geschreven. Neem a.u.b. contact
+ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+      <para>Ze werd door vrijwilligers in hun vrije tijd geschreven. Neem a.u.b. contact
 op met het <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentatie
-Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para> 
+Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Installeren met DrakX</title>
-       <para><note>
-          <para>U zult niet alle installatieschermen zien die in deze handleiding besproken
+
+    <para><note>
+        <para>U zult niet alle installatieschermen zien die in deze handleiding besproken
 worden. Welke schermen u krijgt hangt af van uw systeem en van de keuzes die
 u tijdens het installeren maakt.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -118,29 +157,32 @@ u tijdens het installeren maakt.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/nl/DrakX-inline.xml b/docs/docs/stable/installer/nl/DrakX-inline.xml
new file mode 100644
index 00000000..ab32a10f
--- /dev/null
+++ b/docs/docs/stable/installer/nl/DrakX-inline.xml
@@ -0,0 +1,139 @@
+<?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="nl" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Installeren met DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>U zult niet alle installatieschermen zien die in deze handleiding besproken
+worden. Welke schermen u krijgt hangt af van uw systeem en van de keuzes die
+u tijdens het installeren maakt.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">De teksten en de screenshots in deze handleiding zijn beschikbaar onder de
+CC BY-SA 3.0 licentie <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Deze handleiding werd geproduceerd met behulp van het <link
+ns6:href="http://www.calenco.com">Calenco CMS</link>, ontwikkeld door <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+      <para>Ze werd door vrijwilligers in hun vrije tijd geschreven. Neem a.u.b. contact
+op met het <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentatie
+Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/DrakX.xml b/docs/docs/stable/installer/nl/DrakX.xml
index 8cbe616e..bbbc6d68 100644
--- a/docs/docs/stable/installer/nl/DrakX.xml
+++ b/docs/docs/stable/installer/nl/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="nl" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="nl" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Installeren met DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Installeren met DrakX</title>
 
     <cover>
       <para><note>
@@ -35,18 +73,6 @@ Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -61,23 +87,28 @@ Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -87,7 +118,10 @@ Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -95,19 +129,25 @@ Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -115,11 +155,15 @@ Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -138,4 +182,4 @@ Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/nl/SelectAndUseISOs2.xml b/docs/docs/stable/installer/nl/SelectAndUseISOs2.xml
index 8ffe5780..907130dd 100644
--- a/docs/docs/stable/installer/nl/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/nl/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="nl" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Selecteer en gebruik ISO's</title>
   </info>
   <section>
     <title>Introductie</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
-    <para>There are two families of media:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: Booting with this media provides you with the maximum
-flexibility when choosing what to install, and for configuring your
-system. In particular, you have a choice of which Desktop environment to
-install</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: This option allows you to try out Mageia without having to
-actually install it, or make any changes to your computer.  If the
-installation is decided, the process is simpler, but you get fewer choices
-than offered by the Classical installer</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Details worden gegeven in de volgende secties.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Media</title>
     <section>
       <title>Definitie</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support (DVD, USB
-stick, ...) the ISO file is copied to.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
@@ -43,25 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>Algemene eigenschappen</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the Classical installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
             <para>They are used for performing clean installs or to upgrade a previously
-installed version of Mageia.</para>
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Sommige tools zijn beschikbaar in het Welkomsscherm: Rescue System, Memory
-Test, Hardware Detection Tool.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Elke DVD bevat veel beschikbare bureaubladomgevingen en talen.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>U zult tijdens de installatie de keuze krijgen om nonfree software toe te
-voegen.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -73,21 +107,19 @@ voegen.</para>
         <itemizedlist>
           <listitem>
             <para>Can be used to preview the Mageia operating system without having to install
-it. Can also be used to install Mageia if you wish.</para>
+it</para>
           </listitem>
           <listitem>
-            <para>Elke ISO bevat slechts één werkomgeving (Plasma, GNOME of Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade previously installed Mageia
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Ze bevatten niet-vrije software.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -95,13 +127,13 @@ releases.</emphasis></para>
         <title>PLASMA Live DVD</title>
         <itemizedlist>
           <listitem>
-            <para>Enkel PLASMA-werkomgeving.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Alleen 64-bits architectuur.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -109,13 +141,13 @@ releases.</emphasis></para>
         <title>GNOME Live DVD</title>
         <itemizedlist>
           <listitem>
-            <para>Enkel GNOME werkomgeving.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Alleen 64-bits architectuur</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -123,13 +155,13 @@ releases.</emphasis></para>
         <title>Xfce Live DVD</title>
         <itemizedlist>
           <listitem>
-            <para>Enkel Xfce-werkomgeving.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32- en 64-bits architectuur.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -140,22 +172,10 @@ releases.</emphasis></para>
         <title>Algemene eigenschappen</title>
         <itemizedlist>
           <listitem>
-            <para>These are minimal ISO's containing no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient if
-bandwidth is too low to download a full DVD, or if you have a PC without a
-DVD drive or is unable to boot from a USB stick.</para>
-          </listitem>
-          <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>First steps are English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -163,8 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Bevat enkel vrije software, voor degenen die geen gebruik willen maken van
-niet-vrije software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -172,8 +192,7 @@ niet-vrije software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Bevat non-free software (vooral drivers, codecs...) voor degenen die dit
-nodig hebben.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -185,16 +204,23 @@ nodig hebben.</para>
       <title>Downloaden</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, you are provided with some information, such as
-the mirror in use and an option to switch if the bandwidth is too low. If
-http is chosen, you will also see something regarding checksums.</para>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the
-other, and copy the checksum <link linkend="integrity">for later
-use</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">De integriteit van het gedownloade medium controleren</title>
@@ -202,52 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
 algorithm from the file to be downloaded. You may compare the checksum of
 your downloaded ISO against that of the original source ISO. If the
 checksums do not match, it means that the actual data on the ISO's do not
-match, and if it is the case, then you should retry the download or attempt
-a repair using BitTorrent.</para>
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>To generate the checksum for your downloaded ISO, open a console, (no need
 to be root), and:</para>
       <itemizedlist>
         <listitem>
-          <para>To use md5sum, type: <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>To use sha1sum, type: <userinput>sha1sum
-path/to/the/image/file.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Example:</para>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Brand of dump het ISO</title>
-    <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
-stick. This is not a standard copy operation as a bootable medium will
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
 actually be created.</para>
     <section>
       <title>De ISO op een CD/DVD branden</title>
-      <para>Whichever software you use, ensure that the option to burn an <emphasis
-role="bold">image</emphasis> is used, burn <emphasis
-role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not
-correct. See <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link> for more information.</para>
     </section>
     <section>
       <title>Dump de ISO op een USB-stick</title>
-      <para>Alle Mageia ISO's zijn hybride, dat betekent dat u ze op een USB-stick kunt
-'dumpen' en dan van die USB-stick op kunt starten en installeren.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any existing data will be lost and the partition capacity will
-be reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>Om de oorspronkelijke capaciteit te herstellen, moet u de USB-stick opnieuw
-partitioneren en formatteren.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Gebruik een grafisch hulpmiddel binnen Mageia</title>
         <para>U kunt een grafische tool gebruiken, zoals <link
@@ -259,7 +296,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <itemizedlist>
           <listitem>
             <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -268,7 +305,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Gebruik de commandoregel binnen een GNU/Linux-systeem</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk overwriting
 potentially valuable existing data if you specify the wrong target device.</para>
@@ -278,27 +315,27 @@ potentially valuable existing data if you specify the wrong target device.</para
             <para>Open een terminal</para>
           </listitem>
           <listitem>
-            <para>Become a root (Administrator) user with the command <userinput>su
--</userinput> (don't forget the final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Plug uw USB-stick in (koppel hem niet, dat betekent ook geen applicatie of
-bestandsmanager openen die hem zou kunnen bekijken of lezen)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Voer het commando <userinput>fdisk -l</userinput> in</para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
             <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
             <para>Alternatively, you can find the device name with the command
-<code>dmesg</code>: towards the end of this example, you can see the device
-name starting with <emphasis>sd</emphasis>, and in this case,
-<emphasis>sdd</emphasis> is the actual device. You can also see that its
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
 size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
@@ -320,21 +357,22 @@ size is 2GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: <emphasis role="bold"># <userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Where X=your device name eg: /dev/sdd</para>
-            <para>Example:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-and <emphasis role="bold">of</emphasis> stands for <emphasis
-role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Geef het commando: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>This is the end of the process, and you may now unplug your USB stick.</para>
@@ -343,4 +381,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/acceptLicense.xml b/docs/docs/stable/installer/nl/acceptLicense.xml
index 7aa73449..a92b9338 100644
--- a/docs/docs/stable/installer/nl/acceptLicense.xml
+++ b/docs/docs/stable/installer/nl/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Licentie en uitgave-opmerkingen</title>
   </info>
 
@@ -46,19 +55,26 @@ align="center" condition="live"/></imageobject></mediaobject>
       <title xml:id="license-ti1">Licentie-overeenkomst</title>
     </info>
 
-    <para>Lees de voorwaarden van de licentie-overeenkomst aandachtig door voordat u
-<application>Mageia</application> installeert.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Deze voorwaarden hebben betrekking op de gehele
-<application>Mageia</application> distributie en moeten aanvaard worden
-voordat u verder kunt gaan.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Om verder te gaan, selecteer <guilabel>Accepteren</guilabel> en klik
-vervolgens op <guibutton>Volgende</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Als u de licentievoorwaarden niet wenst te accepteren, dan danken we u voor
-uw interesse in Mageia. Wanneer u op <guibutton>Weigeren</guibutton> klikt
-zal uw computer opnieuw opstarten.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -76,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Important information about this release of
-<application>Mageia</application> can be viewed by clicking on the
-<guibutton>Release Notes</guibutton> button.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/addUser.xml b/docs/docs/stable/installer/nl/addUser.xml
index e4c9ad00..942bdb51 100644
--- a/docs/docs/stable/installer/nl/addUser.xml
+++ b/docs/docs/stable/installer/nl/addUser.xml
@@ -1,32 +1,51 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="nl" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Gebruikersbeheer</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Beheerderswachtwoord (root)  instellen:</title>
     </info>
 
-    <para>It is advisable for all <application>Mageia</application> installations to
-set a <emphasis role="bold">superuser</emphasis> (administrator) password,
-usually called the <emphasis>root password</emphasis> in Linux. As you type
-a password into the top box a shield will change from red to yellow to green
-depending on the strength of the password. A green shield shows you are
-using a strong password. You need to repeat the same password in the box
-underneath, to check that the first entry was not mistyped.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>All passwords are case sensitive. It is best to use a mixture of letters
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
 (upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
@@ -36,43 +55,46 @@ underneath, to check that the first entry was not mistyped.</para>
       <title xml:id="enterUser-ti3">Voer een gebruiker in</title>
     </info>
 
-    <para>Add a user here. A regular user has fewer privileges than the <emphasis
-role="bold">superuser</emphasis> (root), but enough to use the internet,
-office applications or play games and anything else the average user might
-use their computer for.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Pictogram</guibutton>: klik op het pictogram om het te
-veranderen.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Volledige naam</guilabel>: Voer hier de volledige naam van de
-gebruiker in.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use
-a version of the user's real name. <emphasis role="bold">The login name is
-case sensitive.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password</guilabel>: Type in the user password. There is a shield
-at the end of the text box that indicates the strength of the password. (See
-also <xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password (again)</guilabel>: Retype the user password DrakX will
-check that you have not mistyped the password.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Any users you added while installing Mageia, will have a home directory that
-is both read and write protected (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
@@ -82,32 +104,31 @@ management</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Geavanceerd gebruikersbeheer</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>The <guibutton>Advanced</guibutton> option allows you to edit further
-settings for the user you are adding.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
-<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis>
-and <emphasis role="bold">Sh</emphasis></para>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the <emphasis
-role="bold">user ID</emphasis> for any user you added in the previous
-screen. If you are unsure what the purpose of this is, then leave it blank.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/nl/add_supplemental_media.xml b/docs/docs/stable/installer/nl/add_supplemental_media.xml
index 8da3ab3b..fa5cea25 100644
--- a/docs/docs/stable/installer/nl/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/nl/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="nl">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Mediaselectie (Configureer aanvullende installatiebronnen)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,43 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject><imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center"
 revision="1"/></imageobject></mediaobject>
 
-  <para>This screen shows you the list of already recognized repositories. You can
-add other sources for packages, like an optical disc or a remote source.
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
 The source selection determines which packages will be available during the
-next steps.</para>
+subsequent steps.</para>
 
   <para>Voor een netwerkbron dienen twee stappen gevolgd te worden:</para>
 
   <orderedlist>
     <listitem>
-      <para>Kiezen en activeren van een netwerk, tenzij al actief.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
       <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
 mirror, you have access to the selection of all repositories managed by
-Mageia, like the <emphasis role="bold">Nonfree</emphasis>, the <emphasis
-role="bold">Tainted</emphasis> repositories and the <emphasis
-role="bold">Updates</emphasis>. With the URL, you can designate a specific
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
 repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>If you are updating a 64 bit installation which may contain some 32 bit
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
 packages, it is advised to use this screen to add an online mirror by
-ticking one of the Network protocols here. The 64-bit DVD ISO only contains
-64-bit and noarch packages, it will not be able to update the 32-bit
-packages. However, after adding an online mirror, the installer will find
-the needed 32-bit packages there.</para>
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/ask_mntpoint_s.xml b/docs/docs/stable/installer/nl/ask_mntpoint_s.xml
index 3639658d..a5f138e7 100644
--- a/docs/docs/stable/installer/nl/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/nl/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="nl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Kies de koppelpunten</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Hier ziet u de Linux-partities die op de computer gevonden zijn. Als u het
-niet eens bent met de koppelpunten (mount points) die
-<application>DrakX</application> voorstelt, kunt u ze veranderen.</para>
-
-  <note>
-    <para>If you change anything, make sure you still have a <emphasis
-role="bold"><literal>/</literal></emphasis> (root) partition.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis
-role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
-name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis>
-(for example, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>If you have several partitions, you can choose various different mount
-points from the drop down menu, such as <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis
-role="bold">/var</emphasis>. You can even make your own mount points, for
-instance <emphasis role="bold"><literal>/video</literal></emphasis> for a
-partition where you want to store your films, or <emphasis
-role="bold">/Data</emphasis> (or some other name) for your data.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -79,13 +82,17 @@ mount point field blank.</para>
   </itemizedlist>
 
   <warning>
-    <para>If you are not sure what to choose, click <emphasis
-role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
-disk partitioning</guilabel>, where, you can click on a partition to see its
-type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Als u zeker bent dat de koppelpunten goed zijn, klik dan op
-<guibutton>Volgende</guibutton> en kies of u enkel de partities wilt
-formatteren die DrakX voorstelt, of meer.</para>
-</section>
\ No newline at end of file
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/nl/bestTime.xml b/docs/docs/stable/installer/nl/bestTime.xml
index 8e207753..e846c137 100644
--- a/docs/docs/stable/installer/nl/bestTime.xml
+++ b/docs/docs/stable/installer/nl/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="nl" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="nl" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Klok-instellingen</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>Hier dient u te selecteren welke tijd uw interne klok heeft, lokale tijd of
-UTC-tijd.</para>
-
-  <para>In het geavanceerd-tabblad vind u meer klokinstellingsopties.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/bootLive.xml b/docs/docs/stable/installer/nl/bootLive.xml
index 2decdcdd..73ad24c4 100644
--- a/docs/docs/stable/installer/nl/bootLive.xml
+++ b/docs/docs/stable/installer/nl/bootLive.xml
@@ -1,28 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="nl"><info><title xml:id="bootLive-ti1">Start Mageia als Live-systeem</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Het medium opstarten</title></info><section><info><title xml:id="bootLive11-ti1">Van een DVD</title></info><para>U kunt opstarten vanaf de DVD waarop u uw beeldbestand brandde. Vaak gebeurt
-dat vanzelf als de DVD in het DVD-station zit. Anders kunt u in uw BIOS
-instellen vanaf welk apparaat opgestart moet worden. Soms is het mogelijk
-éénmalig van opstartapparaat te wisselen, raadpleeg uw pc-handleiding.</para><para>Afhankelijk van de hardware die u heeft en van hoe die geconfigureerd is,
-krijgt u één van de twee onderstaande schermen.</para></section><section><info><title xml:id="bootLive12-ti1">Van een USB-apparaat</title></info><para>U kunt booten vanaf het USB-apparaat waar u uw ISO-image op
-zette. Afhankelijk van uw BIOS-instellingen, start de computer mogelijk al
-meteen op van de ingeplugde USB-key. Als dat niet gebeurt, dient u uw
-BIOS-instellingen te wijzigen, of een toets in te drukken die u een
-keuzescherm geeft vanaf welk apparaat u de computer wilt booten.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy-modus</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Eerste scherm na starten in BIOS-modus</para></caption></mediaobject><para>In het middelste menu, heeft u de keuze tussen drie acties:</para><itemizedlist><listitem><para>Mageia opstarten: dat betekent dat Mageia 5 van het verbonden medium (cd /
-dvd of usb-stick) zal opstarten zonder iets op de schijf te schrijven, dus
-verwacht een erg langzaam systeem. Als het opstarten eenmaal klaar is, kunt
-u verdergaan naar de installatie op een harde schijf</para></listitem><listitem><para>Mageia installeren: Deze keuze zal Mageia direct op een harde schijf
-installeren</para></listitem><listitem><para>Opstarten vanaf harde schijf: Met deze optie kunt u opstarten vanaf de harde
-schijf, zoals gebruikelijk als er geen medium (cd / dvd of usb-stick) is
-aangesloten. (werkt niet met Mageia 5)</para></listitem></itemizedlist><para>In het onderste menu, zijn de opstartopties:</para><itemizedlist><listitem><para>F1 - Hulp. Leg de opties "splash", "apm", "acpi" en "lde" uit</para></listitem><listitem><para>F2 - Taal. Kies de weergegeven taal van de schermen</para></listitem><listitem><para>F3 - Schermresolutie. Kies tussen tekst, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - Cd-rom. Cd-rom of Overig. Normaal gesproken wordt de installatie
-uitgevoerd vanaf het aangesloten installatiemedium. Hier kunt u andere
-bronnen selecteren, zoals FTP- of NFS-servers. Als de installatie in een
-netwerk met een SLP-server wordt uitgevoerd, selecteer dan één van de
-installatiebronnen beschikbaar op de server met deze optie.</para></listitem><listitem><para>F5 - Driver. Ja of Nee. Het systeem heeft het door als er een optionele
-schijf met een driver-update bestaat en zal het aansluiten hiervan vereisen
-gedurende het installatieproces.</para></listitem><listitem><para>F6 - Kernelopties. Dit is een manier om opties op basis van uw hardware en
-de drivers die u gebruikt te kiezen.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI-modus</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Eerste scherm tijdens het opstarten op een UEFI-systeem vanaf een schijf</para></caption></mediaobject><para>Je hebt alleen de keuze om Mageia in live-modus (eerste keuze) te draaien of
-om het installatieproces te starten (tweede keuze).</para><para>Als u van een USB-stick heeft opgestart, krijgt u twee aanvullende regels
-die dezelfde zijn als de vorige regels, met "USB" erachter gevoegd. U moet
-ze kiezen.</para><para>In ieder geval zullen de eerste stappen hetzelfde zijn om taal, tijdzone en
-toetsenbord te kiezen, dan verschilt het proces, met <link
-linkend="testing">extra stappen in live-modus</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Start Mageia als Live-systeem</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Het medium opstarten</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy-modus</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Eerste scherm na starten in BIOS-modus</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">In UEFI-modus</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/nl/chooseDesktop.xml b/docs/docs/stable/installer/nl/chooseDesktop.xml
index bed41a44..b82d989d 100644
--- a/docs/docs/stable/installer/nl/chooseDesktop.xml
+++ b/docs/docs/stable/installer/nl/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="nl" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Werkomgevingselectie</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Werkomgevingselectie</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide-show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> or <application>GNOME</application>
-desktop environment. Both come with a full set of useful applications and
-tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
-use both), or if you want to modify the default software choices for these
-desktop environments. The <application>LXDE</application> desktop, for
-instance, is lighter than the previous two, sporting less eye candy and
-fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/nl/choosePackageGroups.xml b/docs/docs/stable/installer/nl/choosePackageGroups.xml
index 90c8792c..bf346d4a 100644
--- a/docs/docs/stable/installer/nl/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/nl/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="nl" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="nl" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Pakketgroepselectie</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/nl/choosePackagesTree.xml b/docs/docs/stable/installer/nl/choosePackagesTree.xml
index 7f4bb26c..ffd2e3a0 100644
--- a/docs/docs/stable/installer/nl/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/nl/choosePackagesTree.xml
@@ -1,22 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="nl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="nl">
   <info>
     <title xml:id="choosePackagesTree-ti1">Softwarebeheer</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject><imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/></imageobject></mediaobject>
 
   <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-  <para>Nadat u uw keuze gemaakt hebt kunt u onderaan de pagina op de
-<guibutton>floppy-icoon</guibutton> klikken om uw keuze op te slaan (op een
-USB-stick opslaan werkt ook). Daarna kunt u dat bestand gebruiken om
-dezelfde pakketten op een ander systeem te installeren door tijdens de
-installatie op dezelfde knop te klikken en er voor te kiezen het bestand te
-laden.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/configureServices.xml b/docs/docs/stable/installer/nl/configureServices.xml
index a5f5d76b..bb7b4071 100644
--- a/docs/docs/stable/installer/nl/configureServices.xml
+++ b/docs/docs/stable/installer/nl/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="nl" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="nl" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Configureer uw diensten</title>
   </info>
@@ -7,20 +7,31 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject><imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/></imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose are usually good.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">Als u op een service klikt, ziet u er wat informatie over in het info-vak
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Als u op een service klikt, ziet u er wat informatie over in het info-vak
 beneden.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Verander alleen iets als u heel goed weet wat u doet.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/configureTimezoneUTC.xml b/docs/docs/stable/installer/nl/configureTimezoneUTC.xml
index 8f7b933f..c4511517 100644
--- a/docs/docs/stable/installer/nl/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/nl/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="nl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="nl">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Configureer uw tijdzone</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the
-same time-zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
 or to GMT, also known as UTC.</para>
diff --git a/docs/docs/stable/installer/nl/configureX_card_list.xml b/docs/docs/stable/installer/nl/configureX_card_list.xml
index 02fef9e7..99797f4a 100644
--- a/docs/docs/stable/installer/nl/configureX_card_list.xml
+++ b/docs/docs/stable/installer/nl/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="nl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Kies een X-server (Configureer uw grafische kaart)</title>
   </info>
 
   <mediaobject>
-<imageobject><imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png"
-revision="1"/></imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX heeft een veelomvattende gegevensbank van videokaarten en zal uw
 grafische kaart gewoonlijk juist identificeren.</para>
@@ -29,33 +42,34 @@ grafische kaart gewoonlijk juist identificeren.</para>
   <para>Als het installatieprogramma uw videokaart niet correct gedetecteerd heeft
 en u weet welke u heeft, kunt u deze in de boomstructuur selecteren via: <itemizedlist>
       <listitem>
-        <para>Vendor (producent)</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>dan de naam van uw kaart</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>en het type</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-<emphasis role="bold">Xorg</emphasis> category, which provides more than 40
-generic and open source video card drivers. If you still can't find a
-specific driver for your card there is the option of using the <emphasis
-role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the <emphasis role="bold">Command-line</emphasis> Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the <emphasis role="bold">Nonfree</emphasis>
-repository and in some cases only from the card manufacturers' websites.</para>
-
-  <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be
-explicitly enabled to access them. If you didn't enable it previously, you
-should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/nl/configureX_chooser.xml b/docs/docs/stable/installer/nl/configureX_chooser.xml
index c37fad2f..df9307f9 100644
--- a/docs/docs/stable/installer/nl/configureX_chooser.xml
+++ b/docs/docs/stable/installer/nl/configureX_chooser.xml
@@ -1,62 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="nl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Configuratie van grafische kaart en monitor</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject><imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center"
-revision="1"/></imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym> or any other graphical environment to work well, the
-following <acronym>X</acronym> settings need to be correct. Choose the
-correct settings if none are shown, or if you think the details are
-incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Grafische kaart</guibutton></emphasis>: Kies zonodig uw
-kaart uit de lijst.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from
-the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose
-<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and
-vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Onjuiste verversingsfrequenties kunnen uw monitor beschadigen.</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and
-color depth of your monitor can be set here.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the option is there, and you test your
-settings, you should be ask whether your settings are correct. If you answer
-<emphasis role="bold">yes</emphasis>, the settings will be kept. If you
-don't see anything, you'll return to the configuration screen and be able to
-reconfigure everything until the test result is satisfactory. If the test
-option is not available, then make sure your settings are on the safe side.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Opties</guibutton></emphasis>: Hier kunt u
-verschillende opties toestaan of uitschakelen.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/nl/configureX_monitor.xml b/docs/docs/stable/installer/nl/configureX_monitor.xml
index 0b7fee4c..a6614ba8 100644
--- a/docs/docs/stable/installer/nl/configureX_monitor.xml
+++ b/docs/docs/stable/installer/nl/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="nl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,64 +23,82 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Beeldscherm (Selecteer een monitor)</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX heeft een uitgebreid gegevensbestand met monitors en zal de uwe
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX heeft een uitgebreid gegevensbestand met monitors en zal de uwe
 gewoonlijk correct identificeren.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
 could damage your monitor or video hardware. Please don't try something
 without knowing what you are doing.</emphasis> If in doubt you should
 consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
-<imageobject><imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center"
-revision="1"/></imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Aangepast</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Met deze optie kunt u twee cruciale parameters instellen, de horizontale en
-vertikale verversingsfrequentie. De horizontale is de snelheid waarmee de
-beeldlijnen worden geschreven, de verticale is de snelheid waarmee het hele
-beeld wordt ververst.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">Het is <emphasis>ERG BELANGRIJK</emphasis> dat u geen beeldscherm instelt
+        <para revision="1" xml:id="configureX_monitor-pa4">Het is <emphasis>ERG BELANGRIJK</emphasis> dat u geen beeldscherm instelt
 met andere mogelijke verversingsfrequenties dan die van uw monitor: u zou uw
 monitor kunnen beschadigen. Raadpleeg de handleiding van uw monitor en wees
 terughoudend bij het instellen in geval van twijfel.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug'n Play</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">Dit is the standaard optie, waarbij het beeldscherm de gegevens levert die
-uw computer nodig heeft om het goed te configureren.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Vendor (producent)</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">Als DrakX uw beeldscherm niet goed herkent en u weet welke monitor u heeft,
-kunt u deze als volgt in de boomstructuur kiezen: <itemizedlist>
       <listitem>
-        <para>Vendor (producent)</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>naam van de fabrikant</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>naam en type nummer van het beeldscherm</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Als DrakX uw beeldscherm niet goed herkent en u weet welke monitor u heeft,
+kunt u deze als volgt in de boomstructuur kiezen:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Algemeen</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the <emphasis
-role="bold">Vesa</emphasis> card driver when your video hardware cannot be
-determined automatically. Once again it may be wise to be conservative in
-your selections.</para>
-</section>
\ No newline at end of file
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/nl/diskPartitioning.xml b/docs/docs/stable/installer/nl/diskPartitioning.xml
new file mode 100644
index 00000000..296ebbdf
--- /dev/null
+++ b/docs/docs/stable/installer/nl/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="nl" version="5.0" xml:lang="nl">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/diskdrake.xml b/docs/docs/stable/installer/nl/diskdrake.xml
index a333a6aa..1dd76e58 100644
--- a/docs/docs/stable/installer/nl/diskdrake.xml
+++ b/docs/docs/stable/installer/nl/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="nl" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Aangepaste schijfpartitionering met DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis>
-partition you must ensure that you have a separate <emphasis
-role="bold">/boot</emphasis> partition. The encryption option for the
-<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise
-your system will be unbootable.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view their details before you start.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage
-device like a USB key). In the screen-shot above there are two available
-devices: <emphasis role="bold">sda </emphasis>and <emphasis
-role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if
-you are sure you want to wipe all partitions on the selected storage device.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Expert mode</guibutton> provides more options such as a label
-(give a name to) a partition, or to choose a partition type.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Klik dan op <guibutton>Klaar</guibutton>.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
-Partition) is present and correctly mounted on /boot/EFI (see below)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"><imagedata fileref="dx2-diskdrake2.png"
-align="center"/></imageobject><imageobject condition="live"><imagedata
-align="center" fileref="live-diskdrake2.png"/></imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>Als u Mageia op een Legacy/GPT-systeem installeert, zorg dan dat een
-BIOS-opstart-partitie beschikbaar is en daarnaast ook van het juiste type is</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"><imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/></imageobject><imageobject
 condition="live"><imagedata align="center"
-fileref="live-doPartitionDisks3.png"/></imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/></imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/nl/doPartitionDisks.xml b/docs/docs/stable/installer/nl/doPartitionDisks.xml
index b3e81b11..21d31a68 100644
--- a/docs/docs/stable/installer/nl/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/nl/doPartitionDisks.xml
@@ -1,54 +1,95 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="nl" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Partitionering</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the
-DrakX partitioning proposals for where to install
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the
-layout and content of your particular hard drive(s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Huidige partities gebruiken</para>
+  <itemizedlist>
+    <title>Main Options</title>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">Als deze optie beschikbaar is, werden bestaande Linux compatibele partities
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa5">Als deze optie beschikbaar is, werden bestaande Linux compatibele partities
 gevonden die gebruikt kunnen worden voor het installeren.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Vrije ruimte gebruiken</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">Als u ongebruikte ruimte op uw harde schijf heeft die u voor uw nieuwe
+      <para revision="1" xml:id="doPartitionDisks-pa7">Als u ongebruikte ruimte op uw harde schijf heeft die u voor uw nieuwe
 Mageia-installatie wilt gebruiken, kies dan deze optie.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Gebruik vrije ruimte op een Windows Partitie</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
+
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">DrakX kan aanbieden de ongebruikte ruimte van een windows partitie te
-gebruiken.</para>
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">Dit kan een bruikbare manier zijn om plaats voor uw nieuwe Mageia
-installatie te maken, maar het is een riskante onderneming dus zorg dat u
-van al uw belangrijke bestanden een reservekopie heeft!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Merk op dat de Windows partitie hiervoor kleiner gemaakt moet worden, wat
 niet zonder enig risico is. De partitie moet "schoon" zijn, wat inhoudt dat
 Windows correct afgesloten moet zijn toen het voor het laatst gebruikt werd
@@ -56,119 +97,119 @@ en dat het gedefragmenteerd moet zijn. Dit is echter geen garantie dat alle
 bestanden op de partitie uit het gebied gehaald zijn dat op het punt staat
 gebruikt te worden. Het wordt sterk aanbevolen om vooraf een kopie van uw
 persoonlijke bestanden te maken op een andere schijf of lokatie.</para>
+      </important>
+    </listitem>
 
-        <para>With this option, the installer displays the remaining Windows partition in
-light blue and the proposed Mageia partition in dark blue with their
-intended sizes just underneath. You have the option to modify these sizes by
-clicking and dragging the gap between both partitions. See the following
-screen-shot.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Volledige harde schijf wissen en gebruiken.</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">This option will allocate the entire drive for Mageia.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Let op! Hierdoor zullen ALLE gegevens op de geselecteerde harde schijf
-gewist worden. Wees voorzichtig!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">Hiermee krijgt u volledige controle over het plaatsen van de installatie op
+uw harde schijf of schijven.</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">Gebruik deze optie niet als u van plan bent om een deel van de schijf voor
-iets anders te gebruiken, of als u er gegevens op hebt staan die u niet wilt
-verliezen.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Aangepaste schijfpartitionering</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">Hiermee krijgt u volledige controle over het plaatsen van de installatie op
-uw harde schijf of schijven.</para>
-      </listitem>
-    </itemizedlist></para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Partitie grootte:</emphasis></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para>If you are not using the <emphasis role="bold">Custom disk
-partitioning</emphasis> option, the installer will allocate the available
-space according to the following rules:</para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>If the total available space is less than 50 GB, then only one partition is
-created. This will be the <emphasis role="bold">/</emphasis> (root)
-partition.</para>
-      </listitem>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-      <listitem>
-        <para>If the total available space is greater than 50 GB, then three partitions
-are created</para>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 of the total available place is allocated to <emphasis
-role="bold">/</emphasis> with a maximum of 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19e gaat naar de swap-partitie, tot een maximum van 4 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>the rest (at least 12/19) is allocated to <emphasis
-role="bold">/home.</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-  <para>That means that from 160 GB or greater available space, the installer will
-create three partitions: 50 GB for <emphasis role="bold">/</emphasis>, 4 GB
-for <emphasis role="bold">swap</emphasis> and the remainder for <emphasis
-role="bold">/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
-automatically detected - or created if it does not exist yet, and mounted on
-/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to
-create a BIOS boot partition if not already existing. It is a roughly 1 MiB
-partition with no mount point. Choose <xref linkend="diskdrake"/> to be able
-to create it with the Installer like any other partition, just select BIOS
-boot partition as the filesystem type.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"><imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/></imageobject><imageobject
-condition="live"><imagedata
+condition="live"><imagedata align="center"
 fileref="live-doPartitionDisks3.png"/></imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512. Due to lack of available hardware, the
 partitioning tool used in the installer has not been tested with such a
-drive. Also some SSD devices now use an erase block size over 1 MB. If you
-have such a device we suggest that you partition the drive in advance, using
-an alternative partitioning tool like <emphasis
-role="bold">gparted</emphasis>, and to use the following settings:</para>
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/nl/exitInstall.xml b/docs/docs/stable/installer/nl/exitInstall.xml
index 5a12eebe..a3433cee 100644
--- a/docs/docs/stable/installer/nl/exitInstall.xml
+++ b/docs/docs/stable/installer/nl/exitInstall.xml
@@ -5,22 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">U bent klaar met het installeren en configuren van
-<application>Mageia</application> en u kunt nu met een gerust hart het
-installatiemedium verwijderen en uw computer herstarten.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems (if there are more than one) on your computer.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">Als u de instellingen voor de opstartlader niet aangepast heeft, wordt
 Mageia automatisch geselecteerd en gestart.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Veel plezier!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Bezoek www.mageia.org als u vragen heeft of als u wilt bijdragen aan Mageia</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/firewall.xml b/docs/docs/stable/installer/nl/firewall.xml
index c65c6624..223f49d4 100644
--- a/docs/docs/stable/installer/nl/firewall.xml
+++ b/docs/docs/stable/installer/nl/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="nl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="nl" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Firewall</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Firewall</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
   <para>In the default setting (no button is checked), no service of the system is
-accessible from the network. The <emphasis role="bold">Everything (no
-firewall)</emphasis> enables access to all services of the machine - an
-option that does not make much sense in the context of the installer since
-it would create a totally unprotected system. Its veritable use is in the
-context of the Mageia Control Center (which uses the same GUI layout) for
-temporarily disabling the entire set of firewall rules for testing and
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
 debugging purposes.</para>
 
   <para>All other options are more or less self-explanatory. As an example, you will
-enable the <emphasis role="bold">CUPS server</emphasis> if you want printers
-on your machine to be accessible from the network.</para>
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Geavanceerd</emphasis></para>
 
-  <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where
-you can enable a series of services by typing a list of couples (blank
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
   <para><emphasis>&lt;poort-nummer>/&lt;protocol></emphasis></para>
diff --git a/docs/docs/stable/installer/nl/formatPartitions.xml b/docs/docs/stable/installer/nl/formatPartitions.xml
index 66950e64..3d0660d3 100644
--- a/docs/docs/stable/installer/nl/formatPartitions.xml
+++ b/docs/docs/stable/installer/nl/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="nl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formatteren</title>
   </info>
@@ -11,34 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"><imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/></imageobject><imageobject
-condition="live"><imagedata format="PNG" xml:id="live-formatPartitions-im1"
-align="center" fileref="live-formatPartitions.png"
-revision="1"/></imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
 partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Gewoonlijk moeten tenminste de partities die DrakX selecteerde,
-geformatteerd worden.</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Kies <guibutton>Geavanceerd</guibutton> om partities te selecteren die u
-wilt controleren op zogenoemde <emphasis>slechte blokken</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen,
-where you can choose to view details of your partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">Klik op <guibutton>Volgende</guibutton> om door te gaan als u zeker bent van
-uw keus.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/nl/graphicalConfiguration.xml b/docs/docs/stable/installer/nl/graphicalConfiguration.xml
new file mode 100644
index 00000000..6c238883
--- /dev/null
+++ b/docs/docs/stable/installer/nl/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/nl/installUpdates.xml b/docs/docs/stable/installer/nl/installUpdates.xml
index 0fc6a1ee..d9f856fd 100644
--- a/docs/docs/stable/installer/nl/installUpdates.xml
+++ b/docs/docs/stable/installer/nl/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="nl">
-  <info>
-    <title xml:id="installUpdates-ti1">Updates</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Updates</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Sinds deze versie van <application>Mageia</application> werd uitgegeven,
-kunnen sommige pakketten bijgewerkt of verbeterd zijn.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them,
-select <guilabel>No</guilabel> if you don't want to do this now, or if you
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
 aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Press <guibutton>Next</guibutton> to continue</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/installer.xml b/docs/docs/stable/installer/nl/installer.xml
index ab98dd4d..d2316ba7 100644
--- a/docs/docs/stable/installer/nl/installer.xml
+++ b/docs/docs/stable/installer/nl/installer.xml
@@ -6,167 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, het Mageia-installatieprogramma</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, het Mageia-installatieprogramma</title>
   </info>
 
   <para>DrakX is ontworpen om uw installatie of systeemopwaardering zo gemakkelijk
 mogelijk te maken, ongeacht of GNU-Linux nieuw is voor u of dat u een
 ervaren gebruiker bent.</para>
 
-  <para>Het beginscherm heeft een menu met verscheidene opties, als u niets
-verandert zal de installatie starten, wat gewoonlijk het enige is dat u
-nodig heeft.</para>
+  <section>
+    <title>De Installatiestappen</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Allereerste installatiewelkomsscherm</title>
 
-    <section>
-      <title>Een Mageia DVD gebruiken</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject><imagedata fileref="dx-welcome2.png"/></imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>From this screen, you have access to options by pressing "<emphasis
-role="bold">e</emphasis>" to enter the edit mode. To come back to this
-screen, press either <emphasis role="bold">Esc</emphasis> key to quit
-without saving or press the key <emphasis role="bold">Ctrl</emphasis> or
-<emphasis role="bold">F10</emphasis> to quit with saving.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject><imagedata fileref="dx-welcome.png"/></imageobject></mediaobject>
-
-      <para>From this screen, it is possible to set some preferences (note that the
-options <emphasis role="bold">F1</emphasis> to <emphasis
-role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist>
-          <listitem>
-            <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis
-role="bold">F6</emphasis> options, you can view relevant help by pressing
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a
-specific language for the installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>If needed, change the screen resolution by pressing <emphasis
-role="bold">F3</emphasis> (Legacy mode only).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis role="bold">F6</emphasis> <emphasis
-role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis
-role="bold">e</emphasis> instead).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Default: It doesn't alter anything in the default options.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: Priority is given to the safer options at the price of a
-performance detriment.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI: (Advanced Configuration and Power Interface): Power management
-features are not used.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU
-interrupt. Select this option if you experience system misbehaviour like a
-kernel panic in relation to APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>Indien u een van deze mogelijkheden selecteert, worden de standaard opties
-aangepast, die zichtbaar zijn in de <guilabel>Bootopties</guilabel>regel.</para>
-
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with
-<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot
-Options</guilabel> line, despite this, they will in fact be applied.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various
-boot options. Select an item with the arrow keys and press <emphasis
-role="bold">Enter</emphasis> for more details or press <emphasis
-role="bold">Esc</emphasis> to go back to the welcome screen.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>The detailed view about the splash option. Press <emphasis
-role="bold">Esc</emphasis> or select <guilabel>Return to Boot
-Options</guilabel> to go back to the options list. These options can be
-added by hand in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>Voor meer informatie over kernelopties in legacy- en UEFI-sytemen, zie:
-<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>
-(Engels).</para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>De Installatiestappen</title>
+    <section>
+      <title>UEFI Systems</title>
 
-    <para>The install process is divided into a number of steps, the status of which
-is indicated in a panel to the left of the screen.</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
-options.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
-about the particular step.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
-is possible to reboot, but please think twice before you do this. Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -177,19 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>Na het eerste scherm kwam u niet bij het taalkeuzescherm.  Dit kan gebeuren
-bij sommige grafische kaarten en oudere systemen.  Probeer een lagere
-resolutie te gebruiken door "vgalo" te typen bij de "boot:"-prompt.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this press <emphasis role="bold">Esc</emphasis> at the first welcome screen
-and confirm with <emphasis role="bold">ENTER</emphasis>. You will be
-presented with a black screen with the word "boot:". Type "text" and press
-<emphasis role="bold">ENTER</emphasis> to continue with the installation in
-text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -197,11 +195,11 @@ text mode.</para>
     <section>
       <title>Installatieblokkades</title>
 
-      <para>Als het systeem tijdens de installatie blokkeert, kan er een probleem zijn
-met de hardware detectie. In dit geval kan de automatische detectie van
-hardware overgeslagen worden om later te regelen. Type
-"<literal>noauto</literal>" bij de prompt om dit te proberen. Deze optie mag
-zonodig met beide vorige gecombineerd worden.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -209,17 +207,18 @@ zonodig met beide vorige gecombineerd worden.</para>
 
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dynamische partities</title>
 
-      <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis>
-format to <emphasis role="bold">dynamic</emphasis> format in Microsoft
-Windows, then it is not possible to install Mageia on this disc. To revert
-to a basic disk, see the Microsoft documentation: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/nl/locale.xml b/docs/docs/stable/installer/nl/locale.xml
new file mode 100644
index 00000000..422b2aa3
--- /dev/null
+++ b/docs/docs/stable/installer/nl/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/nl/login.xml b/docs/docs/stable/installer/nl/login.xml
index cb057e0a..41b66d86 100644
--- a/docs/docs/stable/installer/nl/login.xml
+++ b/docs/docs/stable/installer/nl/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="nl"><info><title xml:id="label-to-adapt-ti1">Aanmeldscherm</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM-aanmeldscherm</para></caption></mediaobject><para>Tenslotte komt u bij het aanmeldscherm</para><para>Voer uw gebruikersnaam en gebruikerswachtwoord in, en binnen een paar
-seconden bevindt u zich in een opgestartte KDE- of GNOME-desktopomgeving,
-afhankelijk van welk medium u gebruikt heeft. U kunt nu beginnen met uw
-Mageia-installatie te gebruiken.</para><para>Meer documentatie vindt u in <link
-ns4:href="https://wiki.mageia.org/en/Documentation">de Mageia wiki</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="nl">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/media_selection.xml b/docs/docs/stable/installer/nl/media_selection.xml
index 17b9809b..f0b01357 100644
--- a/docs/docs/stable/installer/nl/media_selection.xml
+++ b/docs/docs/stable/installer/nl/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="nl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Mediaselectie (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Hier vindt u de lijst van beschikbare bronnen.  Niet alle bronnen zijn
 beschikbaar, overeenkomstig de media die U gebruikt om van te
@@ -32,11 +41,11 @@ bevat de basis van de distributie.</para>
     </listitem>
 
     <listitem>
-      <para>De <emphasis>Nonfree</emphasis> bron bevat pakketten die vrij van betaling
-zijn, d.w.z. Mageia kan die herdistribueren, maar zij bevatten
-gesloten-bron-software (vandaar de naam Nonfree, oftewel Nietvrij). Deze
-bron bevat bijvoorbeeld eigen drivers van nVidia en ATI voor grafische
-kaarten, fabriekssoftware voor diverse WiFi kaarten, e.d.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/nl/minimal-install.xml b/docs/docs/stable/installer/nl/minimal-install.xml
index 1ed36b91..4bd693e0 100644
--- a/docs/docs/stable/installer/nl/minimal-install.xml
+++ b/docs/docs/stable/installer/nl/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="nl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="nl">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Minimale installatie</title>
   </info>
@@ -10,30 +13,44 @@
 
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
-  <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+  
 
-  <para>Minimal Installation is intended for those with specific uses in mind for
-<application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the <emphasis
-role="bold">Individual package selection</emphasis> option mentioned above,
-to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>If you choose this installation method, then the relevant screen will offer
-you a few useful extras to install, such as documentation and X.</para>
+  
 
-  <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
 lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para>De basisdocumentatie wordt geleverd in de vorm van man- en info-pagina's. Ze
-bevat de manpagina's van het <link
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
-Project</link> en de <link
+Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
-coreutils</link> info-pagina's.</para>
+coreutils</link> info pages.</para>
 
   <mediaobject>
 <imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
diff --git a/docs/docs/stable/installer/nl/misc-params.xml b/docs/docs/stable/installer/nl/misc-params.xml
index dbaafe16..ded977f2 100644
--- a/docs/docs/stable/installer/nl/misc-params.xml
+++ b/docs/docs/stable/installer/nl/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="nl" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Overzicht van diverse instellingen</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
 
   <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
 the choices you made and on the hardware detected. You can check the
 settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>As a general rule, it is recommended that you accept the default settings
@@ -27,7 +43,7 @@ standaardinstelling</para>
         </listitem>
 
         <listitem>
-          <para>some other factor mentionned in the detailed sections below is an issue.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -39,46 +55,47 @@ standaardinstelling</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Tijdzone</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
 can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Land</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
 setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Opstartlader</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX heeft goede keuzes gemaakt voor de instellingen voor de opstartlader.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Zie voor meer infomatie <xref linkend="setupBootloader"></xref></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Gebruikersbeheer</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Hier kunt u extra gebruikers toevoegen. Ze zullen hun eigen
-<literal>/home</literal> mappen krijgen.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Diensten</guilabel></para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
 (daemons).  This tool allows you to enable or disable certain processes.</para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Wees voorzichting voor u iets verandert- een vergissing kan verhinderen dat
-uw computer goed werkt.</para>
-
-        <para>Voor meer informatie, zie <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -90,7 +107,7 @@ uw computer goed werkt.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Toetsenbord</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
 of keyboard.</para>
@@ -102,27 +119,32 @@ hou dan in gedachten dat uw wachtwoorden ook veranderen.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Muis</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Hier kunt u ook andere aanwijsapparaten toevoegen of configureren, zoals
 trackballs and touchpads.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Geluidskaart</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The
-option to select a different driver is only given when there is more than
-one driver for your card, but where none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Grafische interface</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Hier kunt u uw grafische kaart(en) en beelscherm(en) instellen.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Voor meer informatie, zie <xref linkend="configureX_chooser"></xref>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -137,11 +159,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Netwerk</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, using the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
@@ -151,14 +173,14 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxies</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">Een proxy server werkt als een tussenpersoon tussen uw computer en het
-verdere internet. In deze sectie kunt u uw computer zo configureren dat hij
-een proxy service gebruikt.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -170,26 +192,31 @@ need to enter here.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Beveiligingsniveau</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Stel hier het beveiligingsniveau voor uw computer in, in de meeste gevallen
-is de standaardinstelling (Standaard) geschikt voor algemeen gebruik.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Controleer welke optie het beste bij uw gebruik past.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Firewall</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">Een firewall is bedoeld as barrière tussen uw belangrijke gegevens en de
-boeven daarbuiten op internet die ze zouden willen aantasten of stelen.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Selecteer de diensten die toegang tot uw systeem mogen hebben. Uw selectie
-hangt af van waar u uw computer voor gebruikt, voor meer informatie zie
-<xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Denk eraan dat alles toestaan (geen firewall) erg riskant kan zijn.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/nl/reboot.xml b/docs/docs/stable/installer/nl/reboot.xml
index c6223c1f..b1f16266 100644
--- a/docs/docs/stable/installer/nl/reboot.xml
+++ b/docs/docs/stable/installer/nl/reboot.xml
@@ -1,19 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="nl" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Herstarten</title>
   </info>
   
-  <para>Als de bootloader (opstartlader) eenmaal is geïnstalleerd, wordt u gevraagd
-om uw computer te "halten" (stoppen), de live-cd te verwijderen en de
-computer te herstarten. klik op <emphasis
-role="bold"><guibutton>Voltooien</guibutton></emphasis> en handel zoals
-gevraagd<emphasis role="bold"> in deze volgorde!</emphasis></para>
+  
+  <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>Als u de computer opnieuw opstart, zult u meerdere downloadvoortgangsbalken
-zien die elkaar opvolgen. Dit geeft aan dat de softwaremedialijsten worden
-gedownload (zie Softwarebeheer).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/nl/securityLevel.xml b/docs/docs/stable/installer/nl/securityLevel.xml
index f7e4b723..1b50b014 100644
--- a/docs/docs/stable/installer/nl/securityLevel.xml
+++ b/docs/docs/stable/installer/nl/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="nl" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Beveiligingsniveau</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended
-setting for the average user. The <emphasis role="bold">Secure</emphasis>
-setting will create a highly protected system - for instance if the system
-is to be used as a public server.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Security Administrator</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
 which require notification to a system administrator.</para>
 
-  <para>A good, and easy-to-implement, choice is to enter &lt;user>@localhost -
-where &lt;user> is the login name of the user to receive these messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
 be configured for receiving such mail!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/nl/selectCountry.xml b/docs/docs/stable/installer/nl/selectCountry.xml
index 0cdb9a1e..76e6105e 100644
--- a/docs/docs/stable/installer/nl/selectCountry.xml
+++ b/docs/docs/stable/installer/nl/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="nl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="nl">
   <info>
     <title xml:id="selectCountry-ti1">Selecteer uw land</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Selecteer uw land.  Dit is belangrijk voor allerlei instellingen, zoals de
-muntsoort en de toegestane draadloze instellingen. Het verkeerde land
-instellen kan veroorzaken dat u geen draadloos netwerk kunt gebruiken.</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+like the currency and wireless regulatory domain. Setting the wrong country
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> option and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem that a country from the
-first list was chosen. Please ignore this, as DrakX will apply your actual
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,7 +40,7 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Invoermethode</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
@@ -39,9 +50,9 @@ selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via <emphasis role="bold">Configure
-your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
-running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/selectInstallClass.xml b/docs/docs/stable/installer/nl/selectInstallClass.xml
index 142c5ab9..eb53a5dd 100644
--- a/docs/docs/stable/installer/nl/selectInstallClass.xml
+++ b/docs/docs/stable/installer/nl/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="nl" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Installeren of opwaarderen</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Installeren</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option to perform a fresh installation of
-<application>Mageia</application>. This will format the root partition (/),
-but can preserve a separated /home partition.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Opwaarderen</para>
-
-      <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that has reached
-its End Of Life, then it is better to do a clean install instead while
-preserving your <literal>/home</literal> partition.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that, and only if you are very sure
-rebooting is what you want, go to a text terminal by pressing <guilabel>Alt
-Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the <emphasis role="bold">Install or Upgrade</emphasis>
-screen to the language choice screen by pressing <guilabel>Alt Ctrl
-Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do
-this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/nl/selectKeyboard.xml b/docs/docs/stable/installer/nl/selectKeyboard.xml
index 0e66af85..2b4f8c6e 100644
--- a/docs/docs/stable/installer/nl/selectKeyboard.xml
+++ b/docs/docs/stable/installer/nl/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="nl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,19 +19,22 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Toetsenbord</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX selecteert een geschikte toetsenbord-indeling voor uw taal, maar als
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX selecteert een geschikte toetsenbord-indeling voor uw taal, maar als
 dat niet lukt zal hij uitgaan van een VS-toetsenbordindeling (US QWERTY).</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Verzekert u zich er van dat de gekozen selectie juist is. Als u niet weet
+      <para revision="1" xml:id="selectKeyboard-pa2">Verzekert u zich er van dat de gekozen selectie juist is. Als u niet weet
 wat voor indeling uw toetsenbord heeft, kijk dan in de specificaties die
 meegeleverd werden of vraag het aan de leverancier. Er kan zelfs een label
 aan het toetsenbord zitten dat de indeling identificeert. U kunt ook hier
@@ -28,23 +44,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a fuller list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this and
-continue the installation: the keyboard chosen from the full list will be
-applied.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
 extra dialogue screen asking how you would prefer to switch between the
 Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/nl/selectKeyboardLive.xml b/docs/docs/stable/installer/nl/selectKeyboardLive.xml
index 312d412e..3f6e4da4 100644
--- a/docs/docs/stable/installer/nl/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/nl/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="nl" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Toetsenbord kiezen</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>U zult een toetsenbordindeling moeten kiezen dat u in Mageia wilt
-gebruiken. De standaard indeling (deze wordt, met behulp van de taal en
-tijdzone die u zojuist geselecteerd heeft, bepaald) is al geselecteerd.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/nl/selectLanguage.xml b/docs/docs/stable/installer/nl/selectLanguage.xml
index 96420c0f..db099abe 100644
--- a/docs/docs/stable/installer/nl/selectLanguage.xml
+++ b/docs/docs/stable/installer/nl/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="nl" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,53 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Taalkeuze</title>
   </info>
 
-  <para condition="classical">Kies hier uw voorkeurstaal na eerst de lijst voor uw continent uit te
-vouwen. <application>Mageia</application> zal deze selectie gebruiken
-tijdens het installeren en voor het straks geïnstalleerde systeem op uw
-computer.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Kies hier uw taalvoorkeur. <application>Mageia</application> zal deze
-selectie gebruiken tijdens de installatie en voor het straks geïnstalleerde
-systeem op uw computer.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">If it is likely that you (or others) will require several languages to be
-installed on your system, then you should use the <guibutton>Multiple
-languages</guibutton> option to add them now. It will be difficult to add
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
 extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"><imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/></imageobject><imageobject
-condition="live"><imagedata fileref="live-language.png"
-format=""/></imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
+  <important condition="classical">
     <para>Even if you choose more than one language, you must first choose one as your
-preferred language in the first language screen. It will also be marked as
-chosen in the multiple languages screen.</para>
-  </warning>
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
-      <para>Als u de "taal" van uw toetsenbord ook installeert, voorkomt u verwarring
-later tijdens de installatie.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia gebruikt standaard UTF-8 (Unicode) ondersteuning.</para>
-
-      <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple
-languages</emphasis> screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>U kunt de taal van uw systeem na installatie veranderen in het
-Mageia-configuratiecentrum -> Systeem -> Taalinstellingen voor uw systeem
-beheren.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/nl/selectMouse.xml b/docs/docs/stable/installer/nl/selectMouse.xml
index 3d620c8e..7f73d260 100644
--- a/docs/docs/stable/installer/nl/selectMouse.xml
+++ b/docs/docs/stable/installer/nl/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="nl">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Muiskeuze</title>
   </info>
@@ -7,26 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Als u niet gelukkig bent met hoe uw muis reageert, kunt u hier een andere
 kiezen.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Doorgaans is <guilabel>Universeel</guilabel> - <guilabel>Iedere PS/2 en USB
-muis</guilabel> een goede keuze.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Selecteer <guilabel>Universeel</guilabel> - <guilabel>Evdev
-afdwingen</guilabel> om de niet werkende knoppen te configureren van een
-muis met zes of meer knoppen.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/nl/setupBootloader.xml b/docs/docs/stable/installer/nl/setupBootloader.xml
index e8e28a9c..7330378b 100644
--- a/docs/docs/stable/installer/nl/setupBootloader.xml
+++ b/docs/docs/stable/installer/nl/setupBootloader.xml
@@ -1,148 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="nl" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="nl" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Algemene opties voor de opstartlader</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Opstartlader Interface</title>
-    <para>Mageia gebruikt standaard uitsluitend:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>De Mageia grafische menu's zijn mooi :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot
-choose between the <emphasis role="bold">with</emphasis> or <emphasis
-role="bold">without graphical menu</emphasis> options.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to house the bootloader
-(GRUB2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds GRUB2-efi. Although it is possible to have
-several ESPs, only one is required (and advised), whatever the number of
-operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">De Mageia-opstartlader gebruiken</title>
-    <para>By default, and according to your system, Mageia writes one of the
-following:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then untick the <emphasis
-role="bold">Probe Foreign OS</emphasis> option.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
   <section>
-    <title>Een bestaande opstartlader gebruiken</title>
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this documentation, however in most cases it will
-involve running the relevant bootloader installation program which should
-detect and add it automatically. See the documentation for the operating
-system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Met behulp van opeenvolgend laden</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>U zal een waarschuwing krijgen dat de opstartlader ontbreekt, negeer het
-door te klikken op <guibutton>Oke</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Opties</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>Eerste pagina</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you
-set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be required when booting
-to select a booting entry or change settings. The username is <emphasis
-role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will
-check that it matches with the one above.</para></listitem><listitem><para><guilabel>Gevorderd</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for power management. It can save energy by
-stopping unused devices.  Deselecting it could be useful if, for example,
-your computer does not support ACPI or if you think the ACPI implementation
-might cause some problems (for instance random reboots or system lockups).</para></listitem><listitem><para><guilabel>Enable SMP</guilabel>: This option enables/disables symmetric
-multiprocessing for multi core processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the operating system access to
-the Advanced Programmable Interrupt Controller. APIC devices permit more
-complex priority models, and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC manages all external
-interrupts for a specific processor in an SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Algemene opties voor de opstartlader</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Volgende pagina</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Standaard:</guilabel> Besturingssysteem standaard opgestart</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Toevoegen:</guilabel> Met deze optie kunt u de kernel informatie
-overslaan of de kernel vertellen om u meer informatie omtrent het opstarten
-te geven.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Peil vreemd OS</guilabel>: zie hierboven <link
-linkend="setupMageiaBootloader">Met behulp van de Mageia opstartlader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Gevorderd</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-to be used by the boot menu. If you click the down triangle you will be
-offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">Raak zowel ESP als MBR niet aan</emphasis>: zie
-hierboven <link linkend="setupChainLoading">met behulp van de keten
-lader</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Een bestaande opstartlader gebruiken</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Wijzig een opstartmenu-ingang of voeg er een toe</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/setupSCSI.xml b/docs/docs/stable/installer/nl/setupSCSI.xml
index 42b40635..a733819c 100644
--- a/docs/docs/stable/installer/nl/setupSCSI.xml
+++ b/docs/docs/stable/installer/nl/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="nl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Harde schijf detectie</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
 SCSI controllers it may be unable to determine the correct drivers to use
 and subsequently fail to recognise the drive.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s)
-you have.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">DrakX zou deze dan goed moeten instellen.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/nl/software.xml b/docs/docs/stable/installer/nl/software.xml
new file mode 100644
index 00000000..c6ee6466
--- /dev/null
+++ b/docs/docs/stable/installer/nl/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="nl" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nl/soundConfig.xml b/docs/docs/stable/installer/nl/soundConfig.xml
index 58a2944f..f2a6d1a5 100644
--- a/docs/docs/stable/installer/nl/soundConfig.xml
+++ b/docs/docs/stable/installer/nl/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="nl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Geluidsconfiguratie</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if one exists.</para>
+  
 
-  <para>Het standaardstuurprogramma zou zonder problemen moeten werken. Komt u na de
-installatie toch problemen tegen, start dan <command>draksound</command> of
-start MCC (Mageia Configuratiecentrum), klik op de
-<guilabel>Apparatuur</guilabel> tab en dan op
-<guilabel>Audioconfiguratie</guilabel> rechts boven in het scherm.</para>
+  
 
-  <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis
-role="bold">Sound Configuration</emphasis> tool screen, click on
-<guibutton>Troubleshooting</guibutton> to find useful advice about how to
-solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Geavanceerd</title>
     </info>
 
-    <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in
-this screen, during install, is useful if there is no default driver and
-there are several drivers available, but you think the installer selected
-the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on <emphasis
-role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/nl/takeOverHdConfirm.xml b/docs/docs/stable/installer/nl/takeOverHdConfirm.xml
index d4ec10c4..854d0ff0 100644
--- a/docs/docs/stable/installer/nl/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/nl/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="nl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Bevestig het formatteren van de harde schijf</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is
-ok to erase every partition, every operating system and all data that might
-be on that hard disk.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/nl/testing.xml b/docs/docs/stable/installer/nl/testing.xml
index d3f1768f..e7e27950 100644
--- a/docs/docs/stable/installer/nl/testing.xml
+++ b/docs/docs/stable/installer/nl/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Mageia als Live-systeem testen</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Mageia als Live-systeem testen</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Live-modus</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>U krijgt dit scherm als u "Mageia starten" koos. Anders krijgt u de "<link
-linkend="doPartitionDisks">Partitionering</link>-stap"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Hardware testen</title>
       </info>
 
-      <para>Een van de doelen van de Live-modus, is testen of Mageia de hardware correct
-beheert. U kunt zien of alle apparaten een driver hebben in het
-Mageia-configuratiecentrum -> Apparatuur. U kunt veel apparaten testen:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ Mageia-configuratiecentrum -> Apparatuur. U kunt veel apparaten testen:</para>
         </listitem>
 
         <listitem>
-          <para>grafische kaart: als u het bovenstaande scherm ziet, is het al goed.</para>
-        </listitem>
-
-        <listitem>
-          <para>webcam:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ Mageia-configuratiecentrum -> Apparatuur. U kunt veel apparaten testen:</para>
         </listitem>
 
         <listitem>
-          <para>printer: configureren en een testpagina printen</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ Mageia-configuratiecentrum -> Apparatuur. U kunt veel apparaten testen:</para>
         </listitem>
       </itemizedlist>
 
-      <para>Als alles naar wens is, kunt u verder gaan met installeren. En anders kunt u
-met de "Verlaten"-knop de test beëindigen.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>Uw geconfigureerde instellingen worden bewaard voor de installatie.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,15 +68,14 @@ met de "Verlaten"-knop de test beëindigen.</para>
         <title xml:id="testing3-ti1">Start de installatie</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>Om de installatie van de Mageia live-cd of live-dvd naar de harde schijf of
-SSD te activeren, klikt u gewoon op het icoon "Installeer op harde
-schijf". U krijgt dit scherm, en vervolgens de <link
-linkend="doPartitionDisks">Partitioneren</link>-stap als voor de directe
-installatie.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/nl/uninstall-Mageia.xml b/docs/docs/stable/installer/nl/uninstall-Mageia.xml
index 1febebc1..cfdf87cc 100644
--- a/docs/docs/stable/installer/nl/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/nl/uninstall-Mageia.xml
@@ -1,30 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="nl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="nl" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Mageia deïnstalleren</title>
   </info>
 
   
 
+  
+
   <para>If Mageia didn't convince you or you can't install it correctly - in short
 you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-  <para>After your data backup, reboot your Mageia installation DVD and select
-<emphasis role="bold">Rescue system</emphasis>, then, <emphasis
-role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
-will only have Windows, with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>In Windows to recover the space used by Mageia partitions: click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code>. You will recognize a Mageia partition
-because they are labeled <guilabel>Unknown</guilabel>, and also by their
-size and place on the disk. Right click on each of these partitions and
-select <guibutton>Delete</guibutton> to free up the space.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-  <para>Bij XP kon u een nieuwe partitie maken en die formatteren (FAT32 of
-NTFS). De partitie kreeg een partitie letter.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>If you have Vista or 7, you have one more possibility, you can extend the
 existing partition that is at the left of the freed space. There are other
@@ -32,4 +45,4 @@ partitioning tools that can be used, such as <emphasis
 role="bold">gparted</emphasis>, available for both Windows and Linux. As
 always, when changing partitions, be very careful to back up anything
 important to you.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/nl/unused.xml b/docs/docs/stable/installer/nl/unused.xml
index 9fde024e..47192c8a 100644
--- a/docs/docs/stable/installer/nl/unused.xml
+++ b/docs/docs/stable/installer/nl/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="nl" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="nl">
   <info>
     <title xml:id="unused-ti1">Ongebruikt materiaal behouden of verwijderen</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
 
-  <para>In deze stap zal het installatieprogramma naar ongebruikte lokalen pakketten
-en ongebruikte hardwarepakketten zoeken. Dan biedt het u aan om ze te
-verwijderen. Het is een goed idee om dat goed te keuren, behalve als u een
-installatie voorbereidt die op andere hardware moet draaien.</para>
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>De volgende stap is het kopiëren van bestanden naar de harde schijf. Dit
-duurt enige minuten. Dan ziet u een poos een blanco scherm, dat is normaal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/pl/DrakLive-cover.xml b/docs/docs/stable/installer/pl/DrakLive-cover.xml
index 21b6f203..6a805673 100644
--- a/docs/docs/stable/installer/pl/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/pl/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="pl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="pl" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Instalacja z trybu Live</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Styczeń 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Instalacja z trybu Live</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Oficjalna Dokumentacja dla Mageia</para>
+      <para role="tagline">Oficjalna Dokumentacja dla Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Tekst oraz zrzuty ekranu są dostępne na licencji CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-            </para>
-            <para>Ten dokument został stworzony przy pomocy <link
+
+      <para>Tekst oraz zrzuty ekranu są dostępne na licencji CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ten dokument został stworzony przy pomocy <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> rozwijanego przez <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-            </para>
-            <para>Dokumentacja została napisana przez wolontariuszy w ich wolnym czasie. Jeśli
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Dokumentacja została napisana przez wolontariuszy w ich wolnym czasie. Jeśli
 chcesz pomóc poprawić dokumentację skontaktuj się z <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Zespołem
-Dokumentacji</link>, </para> 
+Dokumentacji</link>, </para>
     </cover>
   </info>
+
   <article>
     <title>Instalacja z trybu Live</title>
-       <para><note>
-          <para>Nikt nie zobaczy wszystkich zrzutów ekranu zaprezentowanych w tym
+
+    <para><note>
+        <para>Nikt nie zobaczy wszystkich zrzutów ekranu zaprezentowanych w tym
 manualu. To które ekrany zobaczysz zależy od tego jaki posiadasz sprzęt oraz
 jakich wyborów dokonasz podczas instalacji.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/pl/DrakLive.xml b/docs/docs/stable/installer/pl/DrakLive.xml
index b4fdde6f..6f2c2470 100644
--- a/docs/docs/stable/installer/pl/DrakLive.xml
+++ b/docs/docs/stable/installer/pl/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="pl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="pl" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Instalacja z trybu Live</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Instalacja z trybu Live</title>
 
     <cover>
       <para><note>
@@ -16,10 +31,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> rozwijanego przez <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>Dokumentacja została napisana przez wolontariuszy w ich wolnym czasie. Jeśli
-chcesz pomóc poprawić dokumentację skontaktuj się z <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Zespołem
-Dokumentacji</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>
 
@@ -39,7 +53,12 @@ Dokumentacji</link>, </para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +68,18 @@ Dokumentacji</link>, </para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/pl/DrakX-cover.xml b/docs/docs/stable/installer/pl/DrakX-cover.xml
index 8ab850c2..28f33efb 100644
--- a/docs/docs/stable/installer/pl/DrakX-cover.xml
+++ b/docs/docs/stable/installer/pl/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="pl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="pl" xml:id="Quick-Startup"
+      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>Instalacja za pomocą DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Luty 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Luty 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Oficjalna Dokumentacja dla Mageia</para>
+      <para role="tagline">Oficjalna Dokumentacja dla Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>Tekst oraz zrzuty ekranu są dostępne na licencji CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Ten dokument został stworzony przy pomocy <link
+
+      <para>Tekst oraz zrzuty ekranu są dostępne na licencji CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ten dokument został stworzony przy pomocy <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> rozwijanego przez <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>Dokumentacja została napisana przez wolontariuszy w ich wolnym czasie. Jeśli
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Dokumentacja została napisana przez wolontariuszy w ich wolnym czasie. Jeśli
 chcesz pomóc poprawić dokumentację skontaktuj się z <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Zespołem
-Dokumentacji</link>, </para> 
+Dokumentacji</link>, </para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Instalacja za pomocą DrakX</title>
-       <para><note>
-          <para>Nikt nie zobaczy wszystkich zrzutów ekranu zaprezentowanych w tym
+
+    <para><note>
+        <para>Nikt nie zobaczy wszystkich zrzutów ekranu zaprezentowanych w tym
 manualu. To które ekrany zobaczysz zależy od tego jaki posiadasz sprzęt oraz
 jakich wyborów dokonasz podczas instalacji.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ jakich wyborów dokonasz podczas instalacji.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/pl/DrakX-inline.xml b/docs/docs/stable/installer/pl/DrakX-inline.xml
new file mode 100644
index 00000000..93ba30c9
--- /dev/null
+++ b/docs/docs/stable/installer/pl/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="pl" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Instalacja za pomocą DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>Nikt nie zobaczy wszystkich zrzutów ekranu zaprezentowanych w tym
+manualu. To które ekrany zobaczysz zależy od tego jaki posiadasz sprzęt oraz
+jakich wyborów dokonasz podczas instalacji.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Tekst oraz zrzuty ekranu są dostępne na licencji CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ten dokument został stworzony przy pomocy <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> rozwijanego przez <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Dokumentacja została napisana przez wolontariuszy w ich wolnym czasie. Jeśli
+chcesz pomóc poprawić dokumentację skontaktuj się z <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Zespołem
+Dokumentacji</link>, </para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/DrakX.xml b/docs/docs/stable/installer/pl/DrakX.xml
index 5b16ce2e..5b168c0a 100644
--- a/docs/docs/stable/installer/pl/DrakX.xml
+++ b/docs/docs/stable/installer/pl/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="pl" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="pl" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Instalacja za pomocą DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Instalacja za pomocą DrakX</title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ Dokumentacji</link>, </para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ Dokumentacji</link>, </para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ Dokumentacji</link>, </para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ Dokumentacji</link>, </para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ Dokumentacji</link>, </para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ Dokumentacji</link>, </para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/pl/SelectAndUseISOs2.xml b/docs/docs/stable/installer/pl/SelectAndUseISOs2.xml
index 54732a4f..0d057019 100644
--- a/docs/docs/stable/installer/pl/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/pl/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="pl" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Wybierz i użyj obrazu ISO</title>
   </info>
   <section>
     <title>Wprowadzenie</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
-    <para>There are two families of media:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: Booting with this media provides you with the maximum
-flexibility when choosing what to install, and for configuring your
-system. In particular, you have a choice of which Desktop environment to
-install</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: This option allows you to try out Mageia without having to
-actually install it, or make any changes to your computer.  If the
-installation is decided, the process is simpler, but you get fewer choices
-than offered by the Classical installer</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Details are given in the next sections.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Nośnik</title>
     <section>
       <title>Definicja</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support (DVD, USB
-stick, ...) the ISO file is copied to.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
@@ -43,24 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>Powszechne możliwości</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the Classical installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
             <para>They are used for performing clean installs or to upgrade a previously
-installed version of Mageia.</para>
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Some tools are available in the Welcome screen: Rescue System, Memory Test,
-Hardware Detection Tool.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Each DVD contains many available desktop environments and languages.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Dostaniesz wybór podczas instalacji aby dodać niewolne oprogramowanie.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -72,21 +107,19 @@ Hardware Detection Tool.</para>
         <itemizedlist>
           <listitem>
             <para>Can be used to preview the Mageia operating system without having to install
-it. Can also be used to install Mageia if you wish.</para>
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade previously installed Mageia
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Zawierają one niewolne oprogramowanie.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -94,13 +127,13 @@ releases.</emphasis></para>
         <title>Live DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Plasma desktop environment only.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -108,13 +141,13 @@ releases.</emphasis></para>
         <title>Live DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>Tylko środowisko graficzne GNOME.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -122,13 +155,13 @@ releases.</emphasis></para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Xfce desktop environment only.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 or 64 bit architectures.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -139,22 +172,10 @@ releases.</emphasis></para>
         <title>Powszechne możliwości</title>
         <itemizedlist>
           <listitem>
-            <para>These are minimal ISO's containing no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient if
-bandwidth is too low to download a full DVD, or if you have a PC without a
-DVD drive or is unable to boot from a USB stick.</para>
-          </listitem>
-          <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>First steps are English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -162,8 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -171,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains non-free software (mostly drivers, codecs...) for people who need
-it.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -184,16 +204,23 @@ it.</para>
       <title>Pobieranie</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, you are provided with some information, such as
-the mirror in use and an option to switch if the bandwidth is too low. If
-http is chosen, you will also see something regarding checksums.</para>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the
-other, and copy the checksum <link linkend="integrity">for later
-use</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
@@ -201,52 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
 algorithm from the file to be downloaded. You may compare the checksum of
 your downloaded ISO against that of the original source ISO. If the
 checksums do not match, it means that the actual data on the ISO's do not
-match, and if it is the case, then you should retry the download or attempt
-a repair using BitTorrent.</para>
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>To generate the checksum for your downloaded ISO, open a console, (no need
 to be root), and:</para>
       <itemizedlist>
         <listitem>
-          <para>To use md5sum, type: <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>To use sha1sum, type: <userinput>sha1sum
-path/to/the/image/file.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Example:</para>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Wypal lub zrzuć obraz ISO</title>
-    <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
-stick. This is not a standard copy operation as a bootable medium will
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
 actually be created.</para>
     <section>
       <title>Wypalenie obrazu ISO na CD/DVD</title>
-      <para>Whichever software you use, ensure that the option to burn an <emphasis
-role="bold">image</emphasis> is used, burn <emphasis
-role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not
-correct. See <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link> for more information.</para>
     </section>
     <section>
       <title>Zrzuć obraz ISO na pamięci USB</title>
-      <para>All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick
-and then use it to boot and install the system.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any existing data will be lost and the partition capacity will
-be reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>To recover the original capacity, you must redo partitioning and re-format
-the USB stick.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Używanie graficznych narzędzi w Magei</title>
         <para>You can use a graphical tool like <link
@@ -258,7 +296,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <itemizedlist>
           <listitem>
             <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -267,7 +305,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Użycie linii poleceń w systemie GNU/Linux</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk overwriting
 potentially valuable existing data if you specify the wrong target device.</para>
@@ -277,27 +315,27 @@ potentially valuable existing data if you specify the wrong target device.</para
             <para>Otwórz konsolę</para>
           </listitem>
           <listitem>
-            <para>Become a root (Administrator) user with the command <userinput>su
--</userinput> (don't forget the final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Plug in your USB stick (do not mount it, this also means do not open any
-application or file manager that could access or read it)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Wpisz polecenie <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
             <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
             <para>Alternatively, you can find the device name with the command
-<code>dmesg</code>: towards the end of this example, you can see the device
-name starting with <emphasis>sd</emphasis>, and in this case,
-<emphasis>sdd</emphasis> is the actual device. You can also see that its
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
 size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
@@ -319,21 +357,22 @@ size is 2GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: <emphasis role="bold"># <userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Where X=your device name eg: /dev/sdd</para>
-            <para>Example:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-and <emphasis role="bold">of</emphasis> stands for <emphasis
-role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Wpisz polecenie: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>This is the end of the process, and you may now unplug your USB stick.</para>
@@ -342,4 +381,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/acceptLicense.xml b/docs/docs/stable/installer/pl/acceptLicense.xml
index d15b809f..13cc86b8 100644
--- a/docs/docs/stable/installer/pl/acceptLicense.xml
+++ b/docs/docs/stable/installer/pl/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Licencja oraz informacje o wydaniu</title>
   </info>
 
@@ -46,19 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">Umowa Licencyjna</title>
     </info>
 
-    <para>Przed instalacją <application>Mageia</application>, proszę przeczytać
-uważnie warunki umowy licencyjnej.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Warunki umowy licencyjnej odnoszą się do całej dystrybucji
-<application>Mageia</application> i muszą być zaakceptowane przed
-kontynuacją instalacji.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>To proceed, simply select <guilabel>Accept</guilabel> and then click on
-<guibutton>Next</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Jeśli zdecydujesz że nie zgadzasz się na warunki licencji, dziękujemy za
-zainteresowanie. Kliknięcie <guibutton>Zakończ</guibutton> spowoduje ponowne
-uruchomienie komputera.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -76,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Important information about this release of
-<application>Mageia</application> can be viewed by clicking on the
-<guibutton>Release Notes</guibutton> button.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/addUser.xml b/docs/docs/stable/installer/pl/addUser.xml
index a2edc324..095f9ba3 100644
--- a/docs/docs/stable/installer/pl/addUser.xml
+++ b/docs/docs/stable/installer/pl/addUser.xml
@@ -1,32 +1,51 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Zarządzanie użytkownikami</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Ustawienie hasła administratora (root):</title>
     </info>
 
-    <para>It is advisable for all <application>Mageia</application> installations to
-set a <emphasis role="bold">superuser</emphasis> (administrator) password,
-usually called the <emphasis>root password</emphasis> in Linux. As you type
-a password into the top box a shield will change from red to yellow to green
-depending on the strength of the password. A green shield shows you are
-using a strong password. You need to repeat the same password in the box
-underneath, to check that the first entry was not mistyped.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>All passwords are case sensitive. It is best to use a mixture of letters
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
 (upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
@@ -36,43 +55,46 @@ underneath, to check that the first entry was not mistyped.</para>
       <title xml:id="enterUser-ti3">Dodaj użytkownika</title>
     </info>
 
-    <para>Add a user here. A regular user has fewer privileges than the <emphasis
-role="bold">superuser</emphasis> (root), but enough to use the internet,
-office applications or play games and anything else the average user might
-use their computer for.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Ikona</guibutton>: użycie tego przycisku zmieni ikonę
-użytkownika.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Imię i nazwisko</guilabel>: Wpisz swoje imię i nazwisko do tego
-pola tekstowego</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use
-a version of the user's real name. <emphasis role="bold">The login name is
-case sensitive.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password</guilabel>: Type in the user password. There is a shield
-at the end of the text box that indicates the strength of the password. (See
-also <xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password (again)</guilabel>: Retype the user password DrakX will
-check that you have not mistyped the password.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Any users you added while installing Mageia, will have a home directory that
-is both read and write protected (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
@@ -82,32 +104,31 @@ management</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Zaawansowane Zarządzanie Użytkownikami</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>The <guibutton>Advanced</guibutton> option allows you to edit further
-settings for the user you are adding.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
-<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis>
-and <emphasis role="bold">Sh</emphasis></para>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the <emphasis
-role="bold">user ID</emphasis> for any user you added in the previous
-screen. If you are unsure what the purpose of this is, then leave it blank.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pl/add_supplemental_media.xml b/docs/docs/stable/installer/pl/add_supplemental_media.xml
index ecf6fa06..5f9db51a 100644
--- a/docs/docs/stable/installer/pl/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/pl/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="pl">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Wybór nośników (konfiguracja dodatkowych nośników instalacyjnych)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,44 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>This screen shows you the list of already recognized repositories. You can
-add other sources for packages, like an optical disc or a remote source.
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
 The source selection determines which packages will be available during the
-next steps.</para>
+subsequent steps.</para>
 
   <para>Dla nośników sieciowych, wymagane są dwa kroki:</para>
 
   <orderedlist>
     <listitem>
-      <para>Wybór i aktywacja połączenia sieciowego, jeśli jeszcze nie zostało
-ustanowione.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
       <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
 mirror, you have access to the selection of all repositories managed by
-Mageia, like the <emphasis role="bold">Nonfree</emphasis>, the <emphasis
-role="bold">Tainted</emphasis> repositories and the <emphasis
-role="bold">Updates</emphasis>. With the URL, you can designate a specific
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
 repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>If you are updating a 64 bit installation which may contain some 32 bit
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
 packages, it is advised to use this screen to add an online mirror by
-ticking one of the Network protocols here. The 64-bit DVD ISO only contains
-64-bit and noarch packages, it will not be able to update the 32-bit
-packages. However, after adding an online mirror, the installer will find
-the needed 32-bit packages there.</para>
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/ask_mntpoint_s.xml b/docs/docs/stable/installer/pl/ask_mntpoint_s.xml
index 8c4b1816..ed1df261 100644
--- a/docs/docs/stable/installer/pl/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/pl/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Wybierz punkty montowania</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Tutaj zobaczysz partycje Linux, które zostały znalezione na Twoim
-komputerze. Jeśli nie zgadzasz się z sugestiami <application>instalatora
-DrakX</application>, możesz zmienić punkty montowania.</para>
-
-  <note>
-    <para>If you change anything, make sure you still have a <emphasis
-role="bold"><literal>/</literal></emphasis> (root) partition.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis
-role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
-name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis>
-(for example, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>If you have several partitions, you can choose various different mount
-points from the drop down menu, such as <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis
-role="bold">/var</emphasis>. You can even make your own mount points, for
-instance <emphasis role="bold"><literal>/video</literal></emphasis> for a
-partition where you want to store your films, or <emphasis
-role="bold">/Data</emphasis> (or some other name) for your data.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -79,12 +82,17 @@ mount point field blank.</para>
   </itemizedlist>
 
   <warning>
-    <para>If you are not sure what to choose, click <emphasis
-role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
-disk partitioning</guilabel>, where, you can click on a partition to see its
-type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Jeśli jesteś pewny że punkty montowania są dobrze ustawione, kliknij
-<guibutton>Dalej</guibutton>, by zdecydować które partycje sformatować.</para>
-</section>
\ No newline at end of file
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/pl/bestTime.xml b/docs/docs/stable/installer/pl/bestTime.xml
index 4f46792d..59341385 100644
--- a/docs/docs/stable/installer/pl/bestTime.xml
+++ b/docs/docs/stable/installer/pl/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pl" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="pl" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Ustawienia zegara</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>W tym kroku, musisz wybrać w jakim czasie jest ustawiony twój zegar, czas
-lokalny czy czas UTC.</para>
-
-  <para>W sekcji zaawansowane znajdziesz więcej opcji o ustawieniach zegara.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/bootLive.xml b/docs/docs/stable/installer/pl/bootLive.xml
index 335f02d3..bdc63aee 100644
--- a/docs/docs/stable/installer/pl/bootLive.xml
+++ b/docs/docs/stable/installer/pl/bootLive.xml
@@ -1,29 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="pl"><info><title xml:id="bootLive-ti1">Uruchom Mageia jako wersję Live</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Uruchamianie medium</title></info><section><info><title xml:id="bootLive11-ti1">Z płyty</title></info><para>Możesz uruchomić prosto z urządznia, którego użyłeś do wypalenia obrazu
-(CD-ROM, DVD-ROM...). Zwykle musisz tylko włożyć płytę aby uruchomić
-instalację automatycznie po zresetowaniu komputera. Jeżeli to nie następuje
-musisz zmodyfikować ustawienia w BIOSie, lub kliknąć klawisz pozwalajcy ci
-na wybór urządzenia, z którego komputer uruchomi się.</para><para>Odnosząc się do posiadanego przez ciebie sprzętu oraz tego, jak jest
-skonfigurowany, otrzymasz pierwszy albo drugi z ekranów poniżej.</para></section><section><info><title xml:id="bootLive12-ti1">Z urządzenia USB</title></info><para>Możesz uruchomić z urządzenia USB, na który wypaliłeś obraz ISO. Odnosząc
-się do twoich ustawień BIOS komputer może uruchomić się prosto z urządzenia
-USB podłączonego do portu. Jeżeli to nie następuje powinieneś zmodyfikować
-ustawienia w BIOS lub kliknąć klawisz pozwalający ci na wybór urządzenia, z
-którego komputer się uruchomi.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">W trybie BIOS/CSM/Legacy</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Pierwszy ekran podczas uruchamiania w trybie BIOS</para></caption></mediaobject><para>W środkowym menu, masz wybór pomiędzy trzema akcjami:</para><itemizedlist><listitem><para>Uruchom Mageia: Mageia 5 uruchomi się z podłączonego medium (CD/DVD lub
-urządzenia USB) bez interwencji na twardym dysku, więc spodziewaj się
-wolnego działania systemu. Po uruchomieniu, możesz przejść do instalacji na
-dysku twardym.</para></listitem><listitem><para>Zainstaluj Mageia: Ten wybór zainstaluje Mageia bezpośrednio na dysku
-twardym.</para></listitem><listitem><para>Uruchomienie z dysku twardego: Ten wybór pozwoli ci uruchomić system z dysku
-twardego, jak zwykle, gdy żadne media (CD/DVD lub urządzenie USB) nie są
-podłączone. (nie działa z mageia 5).</para></listitem></itemizedlist><para>W dolnym menu, są Opcje Bootowania:</para><itemizedlist><listitem><para>F1 - Pomoc. Wyjaśnij opcje "splash", "apm", "acpi" i "Ide"</para></listitem><listitem><para>F2 - Język. Wybierz język wyświetlany na ekranach.</para></listitem><listitem><para>F3 - Rozdzielczość obrazu. Wybierz z pośród tekst, 640x400, 800x600,
-1024x728</para></listitem><listitem><para>F4 - CD-ROM. CD-ROM lub Inny. Normalnie instalacja odbywa się z
-zamontowanego medium instalacyjnego. Tutaj wybierz inne źródła, takie jak
-serwer FTP lub NFS. Jeżeli instalacja odbywa się w sieci z serwerem SLP
-wybierz jedno ze źródeł instalacyjnych dostępnych na serwerze za pomocą tej
-opcji.</para></listitem><listitem><para>F5 - Sterownik. Tak lub Nie. System jest świadomy dostępności dysku
-opcjonalnego z aktualizacją sterownika i będzie wymagał jego zamontowania
-podczas procesu instalacji.</para></listitem><listitem><para>F6 - Opcje jądra. Jest to możliwość wybrania opcji według twojego sprzętu
-oraz sterowniki do użycia.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">W trybie UEFI</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Pierwszy ekran podczas uruchamiania w systemie UEFI z dysku</para></caption></mediaobject><para>Masz tylko opcje do uruchomienia Magei w trybie Live (pierwszy wybór), lub
-proces instalacji (drugi wybór).</para><para>Jeżeli uruchomiłeś z urządzenia USB, otrzymasz dwie dodatkowe linie będące
-duplikatem poprzednich z dopiskiem "USB". Musisz wybrać którąś z nich.</para><para>W każdym przypadku, pierwsze kroki będą takie same aby wybrać język, strefę
-czasową oraz klawiaturę, później proces różni się, z <link
-linkend="testing"> dodatkowych kroków w trybie Live</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Uruchom Mageia jako wersję Live</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Uruchamianie medium</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">W trybie BIOS/CSM/Legacy</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Pierwszy ekran podczas uruchamiania w trybie BIOS</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">W trybie UEFI</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/pl/chooseDesktop.xml b/docs/docs/stable/installer/pl/chooseDesktop.xml
index 651d578f..11ee1294 100644
--- a/docs/docs/stable/installer/pl/chooseDesktop.xml
+++ b/docs/docs/stable/installer/pl/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Wybór pulpitu</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Wybór pulpitu</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide-show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> or <application>GNOME</application>
-desktop environment. Both come with a full set of useful applications and
-tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
-use both), or if you want to modify the default software choices for these
-desktop environments. The <application>LXDE</application> desktop, for
-instance, is lighter than the previous two, sporting less eye candy and
-fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/pl/choosePackageGroups.xml b/docs/docs/stable/installer/pl/choosePackageGroups.xml
index 027ec384..9cf33496 100644
--- a/docs/docs/stable/installer/pl/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/pl/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Wybór grup pakietów</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/pl/choosePackagesTree.xml b/docs/docs/stable/installer/pl/choosePackagesTree.xml
index 2f985fba..62b14777 100644
--- a/docs/docs/stable/installer/pl/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/pl/choosePackagesTree.xml
@@ -1,21 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="pl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="pl">
   <info>
     <title xml:id="choosePackagesTree-ti1">Samodzielny wybór pakietów</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-  <para>Po dokonaniu wyboru, możesz kliknąć na <guibutton>ikonę
-dyskietki</guibutton> na dole okna, aby zachować swój wybór pakietów
-(zapisywanie na dysku USB także działa). Możesz użyć tego pliku do
-instalacji tych samych pakietów na innym komputerze, naciskając tą samą
-ikonę i wybierając wczytanie pliku.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/configureServices.xml b/docs/docs/stable/installer/pl/configureServices.xml
index bbf660aa..cf3ce41d 100644
--- a/docs/docs/stable/installer/pl/configureServices.xml
+++ b/docs/docs/stable/installer/pl/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="pl" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Konfiguracja usług</title>
   </info>
@@ -7,20 +7,31 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose are usually good.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">Jeżeli zaznaczysz usługę, niektóre informacje o niej pokażą w okienku
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Jeżeli zaznaczysz usługę, niektóre informacje o niej pokażą w okienku
 poniżej.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Zmień to tylko i wyłącznie wtedy, kiedy wiesz co robisz.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/configureTimezoneUTC.xml b/docs/docs/stable/installer/pl/configureTimezoneUTC.xml
index cbfc0277..e12b9203 100644
--- a/docs/docs/stable/installer/pl/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/pl/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="pl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="pl">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Konfiguruj strefę czasową</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the
-same time-zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
 or to GMT, also known as UTC.</para>
diff --git a/docs/docs/stable/installer/pl/configureX_card_list.xml b/docs/docs/stable/installer/pl/configureX_card_list.xml
index f1fa18b4..625ac299 100644
--- a/docs/docs/stable/installer/pl/configureX_card_list.xml
+++ b/docs/docs/stable/installer/pl/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Wybierz System Graficzny (Skonfiguruj swoją Kartę Graficzną)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX posiada bardzo szeroką bazę danych kart wideo, oraz zwykle
 zidentyfikuje twoje urządzenie wideo poprawnie.</para>
@@ -29,33 +42,34 @@ zidentyfikuje twoje urządzenie wideo poprawnie.</para>
   <para>Jeżeli instalator nie wykrył twojej karty graficznej poprawnie i wiesz, jaką
 kartę posiadasz, możesz wybrać jedną za pomocą: <itemizedlist>
       <listitem>
-        <para>dostawca</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>następnie nazwa karty</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>oraz typ karty</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-<emphasis role="bold">Xorg</emphasis> category, which provides more than 40
-generic and open source video card drivers. If you still can't find a
-specific driver for your card there is the option of using the <emphasis
-role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the <emphasis role="bold">Command-line</emphasis> Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the <emphasis role="bold">Nonfree</emphasis>
-repository and in some cases only from the card manufacturers' websites.</para>
-
-  <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be
-explicitly enabled to access them. If you didn't enable it previously, you
-should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/pl/configureX_chooser.xml b/docs/docs/stable/installer/pl/configureX_chooser.xml
index 992a6b04..7a4efdda 100644
--- a/docs/docs/stable/installer/pl/configureX_chooser.xml
+++ b/docs/docs/stable/installer/pl/configureX_chooser.xml
@@ -1,62 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Konfiguracja Karty Graficznej i Monitora</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym> or any other graphical environment to work well, the
-following <acronym>X</acronym> settings need to be correct. Choose the
-correct settings if none are shown, or if you think the details are
-incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Karta graficzna</guibutton></emphasis>: Wybierz swoją
-kartę graficzną z listy.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from
-the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose
-<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and
-vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Niepoprawna wartość odświeżania może uszkodzić monitor</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and
-color depth of your monitor can be set here.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the option is there, and you test your
-settings, you should be ask whether your settings are correct. If you answer
-<emphasis role="bold">yes</emphasis>, the settings will be kept. If you
-don't see anything, you'll return to the configuration screen and be able to
-reconfigure everything until the test result is satisfactory. If the test
-option is not available, then make sure your settings are on the safe side.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to
-enable or disable various options.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/pl/configureX_monitor.xml b/docs/docs/stable/installer/pl/configureX_monitor.xml
index fbf1f49c..d52232e5 100644
--- a/docs/docs/stable/installer/pl/configureX_monitor.xml
+++ b/docs/docs/stable/installer/pl/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,64 +23,82 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Wybór monitora</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX has a very comprehensive database of monitors and will usually
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX has a very comprehensive database of monitors and will usually
 correctly identify yours.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
 could damage your monitor or video hardware. Please don't try something
 without knowing what you are doing.</emphasis> If in doubt you should
 consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Własny</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Własne</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters, the vertical refresh
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
 rate and the horizontal sync rate. Vertical refresh determines how often the
 screen is refreshed and horizontal sync is the rate at which scan lines are
 displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
+        <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
 type with a sync range that is beyond the capabilities of your monitor: you
 may damage your monitor. If in doubt, choose a conservative setting and
 consult your monitor documentation.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">This is the default option and tries to determine the monitor type from the
-monitor database.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Dostawca</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">If the installer has not correctly detected your monitor and you know which
-one you have, you can select it from the tree by selecting: <itemizedlist>
       <listitem>
-        <para>dostawca</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>nazwa producenta monitora</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>Opis monitora</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can select it from the tree by selecting:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Generic</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the <emphasis
-role="bold">Vesa</emphasis> card driver when your video hardware cannot be
-determined automatically. Once again it may be wise to be conservative in
-your selections.</para>
-</section>
\ No newline at end of file
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/pl/diskPartitioning.xml b/docs/docs/stable/installer/pl/diskPartitioning.xml
new file mode 100644
index 00000000..4e494c3e
--- /dev/null
+++ b/docs/docs/stable/installer/pl/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="pl" version="5.0" xml:lang="pl">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/diskdrake.xml b/docs/docs/stable/installer/pl/diskdrake.xml
index b2d83904..1b414120 100644
--- a/docs/docs/stable/installer/pl/diskdrake.xml
+++ b/docs/docs/stable/installer/pl/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Zaawansowany podział na partycje za pomocą DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis>
-partition you must ensure that you have a separate <emphasis
-role="bold">/boot</emphasis> partition. The encryption option for the
-<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise
-your system will be unbootable.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view their details before you start.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage
-device like a USB key). In the screen-shot above there are two available
-devices: <emphasis role="bold">sda </emphasis>and <emphasis
-role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if
-you are sure you want to wipe all partitions on the selected storage device.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Expert mode</guibutton> provides more options such as a label
-(give a name to) a partition, or to choose a partition type.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Jeśli wszystko zostało już ustawione kliknij <guibutton>Gotowe</guibutton>.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
-Partition) is present and correctly mounted on /boot/EFI (see below)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/pl/doPartitionDisks.xml b/docs/docs/stable/installer/pl/doPartitionDisks.xml
index 6f283297..099ee181 100644
--- a/docs/docs/stable/installer/pl/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/pl/doPartitionDisks.xml
@@ -1,171 +1,213 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Partycjonowanie</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the
-DrakX partitioning proposals for where to install
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the
-layout and content of your particular hard drive(s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Użyj istniejących partycji</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">Jeśli dostępna jest ta opcja, oznacza to że zostały znalezione partycje
+      <para revision="1" xml:id="doPartitionDisks-pa5">Jeśli dostępna jest ta opcja, oznacza to że zostały znalezione partycje
 linuksowe i mogą być użyte do instalacji.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Wykorzystaj wolne miejsce</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">Jeśli posiadasz nieużywane miejsce na dysku (niesformatowane), może być ono
+      <para revision="1" xml:id="doPartitionDisks-pa7">Jeśli posiadasz nieużywane miejsce na dysku (niesformatowane), może być ono
 wykorzystane do instalacji Magei.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Wykorzystaj wolne miejsce na partycji Windows</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">Jeśli masz niewykorzystane miejsce na partycji Windows, instalator
-zaproponuje, aby je wykorzystać.</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">To może być użyteczne rozwiązanie, aby przygotować miejsce na instalację
-Magei, jest to jednak ryzykowna operacja więc powinieneś się upewnić że masz
-kopię zapasową ważnych plików!</para>
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
 
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Zauważ, że ta metoda spowoduje zmniejszenie rozmiaru partycji
 Windows. Partycja musi być "czysta", co oznacza, że Windows musi być
 poprawnie zamknięty za ostatnim razem gdy był używany. Musi być także
 zdefragmentowany, choć to nie daje pewności że wszystkie pliki zostały
 przesunięte poza obszar dysku, który zostanie użyty. Dlatego też bardzo
 wskazane jest zrobienie kopii zapasowej ważnych plików.</para>
+      </important>
+    </listitem>
 
-        <para>With this option, the installer displays the remaining Windows partition in
-light blue and the proposed Mageia partition in dark blue with their
-intended sizes just underneath. You have the option to modify these sizes by
-clicking and dragging the gap between both partitions. See the following
-screen-shot.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Wymaż i wykorzystaj cały dysk</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">This option will allocate the entire drive for Mageia.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Zauważ! WSZYSTKIE dane z wybranego dysku zostaną wymazane. Uważaj!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">Ta opcja daje Ci całkowitą kontrolę nad sposobem przeprowadzenia instalacji.</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">Jeśli chcesz używać części tego dysku do czegoś innego, albo już masz na
-dysku dane, których nie chcesz stracić, nie używaj tej opcji.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Custom disk partitioning</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">Ta opcja daje Ci całkowitą kontrolę nad sposobem przeprowadzenia instalacji.</para>
-      </listitem>
-    </itemizedlist></para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para>If you are not using the <emphasis role="bold">Custom disk
-partitioning</emphasis> option, the installer will allocate the available
-space according to the following rules:</para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>If the total available space is less than 50 GB, then only one partition is
-created. This will be the <emphasis role="bold">/</emphasis> (root)
-partition.</para>
-      </listitem>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-      <listitem>
-        <para>If the total available space is greater than 50 GB, then three partitions
-are created</para>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 of the total available place is allocated to <emphasis
-role="bold">/</emphasis> with a maximum of 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 przestrzeni zostanie przydzielona jako swap, jednak maksimum wynosi 4
-GB</para>
-          </listitem>
-
-          <listitem>
-            <para>the rest (at least 12/19) is allocated to <emphasis
-role="bold">/home.</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-  <para>That means that from 160 GB or greater available space, the installer will
-create three partitions: 50 GB for <emphasis role="bold">/</emphasis>, 4 GB
-for <emphasis role="bold">swap</emphasis> and the remainder for <emphasis
-role="bold">/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
-automatically detected - or created if it does not exist yet, and mounted on
-/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to
-create a BIOS boot partition if not already existing. It is a roughly 1 MiB
-partition with no mount point. Choose <xref linkend="diskdrake"/> to be able
-to create it with the Installer like any other partition, just select BIOS
-boot partition as the filesystem type.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512. Due to lack of available hardware, the
 partitioning tool used in the installer has not been tested with such a
-drive. Also some SSD devices now use an erase block size over 1 MB. If you
-have such a device we suggest that you partition the drive in advance, using
-an alternative partitioning tool like <emphasis
-role="bold">gparted</emphasis>, and to use the following settings:</para>
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/pl/exitInstall.xml b/docs/docs/stable/installer/pl/exitInstall.xml
index 17248838..b9e4edbe 100644
--- a/docs/docs/stable/installer/pl/exitInstall.xml
+++ b/docs/docs/stable/installer/pl/exitInstall.xml
@@ -5,23 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">Instalacja i konfiguracja <application>Magei</application>została
-zakończona, teraz można bezpiecznie usunąć nośnik instalacyjny i uruchomić
-komputer ponownie.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems (if there are more than one) on your computer.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the settings for the bootloader, your Mageia install
 will be automatically selected and started.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Enjoy!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Jeśli masz jakieś pytania, bądź chciał(a)byś dołączyć do pojektu Mageia -
-odwiedź www.mageia.org</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/firewall.xml b/docs/docs/stable/installer/pl/firewall.xml
index 479c0c49..068e910c 100644
--- a/docs/docs/stable/installer/pl/firewall.xml
+++ b/docs/docs/stable/installer/pl/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="pl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="pl" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Firewall</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Firewall</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
   <para>In the default setting (no button is checked), no service of the system is
-accessible from the network. The <emphasis role="bold">Everything (no
-firewall)</emphasis> enables access to all services of the machine - an
-option that does not make much sense in the context of the installer since
-it would create a totally unprotected system. Its veritable use is in the
-context of the Mageia Control Center (which uses the same GUI layout) for
-temporarily disabling the entire set of firewall rules for testing and
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
 debugging purposes.</para>
 
   <para>All other options are more or less self-explanatory. As an example, you will
-enable the <emphasis role="bold">CUPS server</emphasis> if you want printers
-on your machine to be accessible from the network.</para>
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where
-you can enable a series of services by typing a list of couples (blank
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
diff --git a/docs/docs/stable/installer/pl/formatPartitions.xml b/docs/docs/stable/installer/pl/formatPartitions.xml
index 6f07bba9..6a0dfd2c 100644
--- a/docs/docs/stable/installer/pl/formatPartitions.xml
+++ b/docs/docs/stable/installer/pl/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formatowanie</title>
   </info>
@@ -11,33 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
 partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Zazwyczaj przynajmniej te partycje, które zaznaczył instalator, powinny być
-sformatowane</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Kliknij na <guibutton>Zaawansowane</guibutton> aby wybrać, które partycje
-mają zostać sprawdzone na obecnoś tzw. <emphasis>bad bloków</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen,
-where you can choose to view details of your partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">Jeśli jesteś zadowolony ze swojego wyboru, kliknij
-<guibutton>Dalej</guibutton> aby kontynuować.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/pl/graphicalConfiguration.xml b/docs/docs/stable/installer/pl/graphicalConfiguration.xml
new file mode 100644
index 00000000..25224cc5
--- /dev/null
+++ b/docs/docs/stable/installer/pl/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/pl/installUpdates.xml b/docs/docs/stable/installer/pl/installUpdates.xml
index ea79e373..3279d681 100644
--- a/docs/docs/stable/installer/pl/installUpdates.xml
+++ b/docs/docs/stable/installer/pl/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="pl">
-  <info>
-    <title xml:id="installUpdates-ti1">Aktualizacje</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Aktualizacje</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Od czasu gdy ta wersja <application>Magei</application> została
-udostępniona, niektóre pakiety zostały zaktualizowane lub poprawione.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them,
-select <guilabel>No</guilabel> if you don't want to do this now, or if you
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
 aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Press <guibutton>Next</guibutton> to continue</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/installer.xml b/docs/docs/stable/installer/pl/installer.xml
index ba7f5c62..8ade0558 100644
--- a/docs/docs/stable/installer/pl/installer.xml
+++ b/docs/docs/stable/installer/pl/installer.xml
@@ -6,166 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX instalator Mageia</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX instalator Mageia</title>
   </info>
 
   <para>Niezależnie czy jesteś początkującym, czy zaawansowanym użytkownikiem
 GNU-Linuxa, instalator Magei jest zaprojektowany tak, aby uczynić instalację
 lub aktualizację łatwą i przyjemną. </para>
 
-  <para>Pierwszy ekran instalatora zawiera różne opcje,jednak opcja zaznaczona
-domyślnie rozpoczyna instalację i zazwyczaj będzie to wszystko czego
-potrzebujesz.</para>
+  <section>
+    <title>Etapy instalacji</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Ekran powitalny instalatora</title>
 
-    <section>
-      <title>Using a Mageia DVD</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>From this screen, you have access to options by pressing "<emphasis
-role="bold">e</emphasis>" to enter the edit mode. To come back to this
-screen, press either <emphasis role="bold">Esc</emphasis> key to quit
-without saving or press the key <emphasis role="bold">Ctrl</emphasis> or
-<emphasis role="bold">F10</emphasis> to quit with saving.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, it is possible to set some preferences (note that the
-options <emphasis role="bold">F1</emphasis> to <emphasis
-role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist>
-          <listitem>
-            <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis
-role="bold">F6</emphasis> options, you can view relevant help by pressing
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a
-specific language for the installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>If needed, change the screen resolution by pressing <emphasis
-role="bold">F3</emphasis> (Legacy mode only).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis role="bold">F6</emphasis> <emphasis
-role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis
-role="bold">e</emphasis> instead).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Default: It doesn't alter anything in the default options.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: Priority is given to the safer options at the price of a
-performance detriment.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI: (Advanced Configuration and Power Interface): Power management
-features are not used.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU
-interrupt. Select this option if you experience system misbehaviour like a
-kernel panic in relation to APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>When you select one of these entries, it modifies the default options
-displayed in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with
-<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot
-Options</guilabel> line, despite this, they will in fact be applied.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various
-boot options. Select an item with the arrow keys and press <emphasis
-role="bold">Enter</emphasis> for more details or press <emphasis
-role="bold">Esc</emphasis> to go back to the welcome screen.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>The detailed view about the splash option. Press <emphasis
-role="bold">Esc</emphasis> or select <guilabel>Return to Boot
-Options</guilabel> to go back to the options list. These options can be
-added by hand in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>For more information about kernel options on legacy and UEFI systems, see:
-<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>Etapy instalacji</title>
+    <section>
+      <title>UEFI Systems</title>
 
-    <para>The install process is divided into a number of steps, the status of which
-is indicated in a panel to the left of the screen.</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
-options.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
-about the particular step.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
-is possible to reboot, but please think twice before you do this. Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -176,19 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>Po ekranie powitalnym nie wyświetla się ekran wyboru języka. To może się
-zdarzyć dla niektórych kart graficznych lub starszych komputerów. Spróbuj
-użyć niskiej rozdzielczości wpisując w linii komend <code>vgalo</code>.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this press <emphasis role="bold">Esc</emphasis> at the first welcome screen
-and confirm with <emphasis role="bold">ENTER</emphasis>. You will be
-presented with a black screen with the word "boot:". Type "text" and press
-<emphasis role="bold">ENTER</emphasis> to continue with the installation in
-text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -196,10 +195,11 @@ text mode.</para>
     <section>
       <title>Zawieszenie się instalacji</title>
 
-      <para>Jeśli system zawiesi się podczas instalacji, może to oznaczać problem z
-detekcją sprzętu. W tym przypadku automatyczna detekcja sprzętu może zostać
-pominięta. Wpisz w linii komend <code>noauto</code>. Ta opcja może być
-łączona z innymi opcjami jeśli zajdzie taka potrzeba.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -207,17 +207,18 @@ pominięta. Wpisz w linii komend <code>noauto</code>. Ta opcja może być
 
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dynamiczne partycje</title>
 
-      <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis>
-format to <emphasis role="bold">dynamic</emphasis> format in Microsoft
-Windows, then it is not possible to install Mageia on this disc. To revert
-to a basic disk, see the Microsoft documentation: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/pl/locale.xml b/docs/docs/stable/installer/pl/locale.xml
new file mode 100644
index 00000000..301ea8f0
--- /dev/null
+++ b/docs/docs/stable/installer/pl/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/pl/login.xml b/docs/docs/stable/installer/pl/login.xml
index bbdb44f5..c8dc5e3e 100644
--- a/docs/docs/stable/installer/pl/login.xml
+++ b/docs/docs/stable/installer/pl/login.xml
@@ -1,7 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="pl"><info><title xml:id="label-to-adapt-ti1">Ekran logowania</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>Ekran logowania KDM</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Wprowadź twoją nazwę użytkownika oraz hasło, i w ciągu kilku sekund
-powinieneś znaleźć się na załadowanym pulpicie KDE lub GNOME, w zależności
-od tego, które medium live zostało użyte. Możesz teraz zacząć używać twojej
-instalacji Magei.</para><para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="pl">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/media_selection.xml b/docs/docs/stable/installer/pl/media_selection.xml
index b9ccdde0..45f077ea 100644
--- a/docs/docs/stable/installer/pl/media_selection.xml
+++ b/docs/docs/stable/installer/pl/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Wybór nośników (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Tutaj jest lista dostępnych repozytoriów. Nie wszystkie repozytoria są
 dostępne, zależy to od nośników jakie wykorzystujesz do instalacji. Wybór
@@ -32,11 +41,11 @@ zawiera ono podstawowe pakiety dystrybucji.</para>
     </listitem>
 
     <listitem>
-      <para>Repozytorium <emphasis>Nonfree</emphasis> zawiera pakiety wolne od opłat,
-które mogą być udostępniane przez Mageię, lecz zawierają oprogramowanie do
-którego źródła nie są dostępne (stąd nazwa - Nonfree). To repozytorium
-zawiera np. własnościowe sterowniki do kart graficznych nVidia oraz ATI,
-firmware dla niektórych kart WIFI, itp.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/pl/minimal-install.xml b/docs/docs/stable/installer/pl/minimal-install.xml
index dcb7b7e9..44a445c8 100644
--- a/docs/docs/stable/installer/pl/minimal-install.xml
+++ b/docs/docs/stable/installer/pl/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="pl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="pl">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Minimalna instalacja</title>
   </info>
@@ -10,26 +13,40 @@
 
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
-  <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+  
 
-  <para>Minimal Installation is intended for those with specific uses in mind for
-<application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the <emphasis
-role="bold">Individual package selection</emphasis> option mentioned above,
-to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>If you choose this installation method, then the relevant screen will offer
-you a few useful extras to install, such as documentation and X.</para>
+  
 
-  <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
 lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para>The basic documentation is provided in the form of man and info pages.  It
-contains the man pages from the <link
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
 Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
diff --git a/docs/docs/stable/installer/pl/misc-params.xml b/docs/docs/stable/installer/pl/misc-params.xml
index 5ed15193..87770360 100644
--- a/docs/docs/stable/installer/pl/misc-params.xml
+++ b/docs/docs/stable/installer/pl/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Summary of miscellaneous parameters</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
 
   <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
 the choices you made and on the hardware detected. You can check the
 settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>As a general rule, it is recommended that you accept the default settings
@@ -26,7 +42,7 @@ unless:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>some other factor mentionned in the detailed sections below is an issue.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,46 +54,47 @@ unless:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Strefa czasowa</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
 can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Kraj / Region</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
 setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>System rozruchowy</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX has made good choices for the bootloader setting.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">For more information, see <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>User management</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each get their own
-<literal>/home</literal> directories.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Usługi</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
 (daemons).  This tool allows you to enable or disable certain processes.</para>
 
         <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
-prevent your computer from operating correctly.</para>
-
-        <para>For more information, see <xref linkend="configureServices"/></para>
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -89,7 +106,7 @@ prevent your computer from operating correctly.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Klawiatura</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
 of keyboard.</para>
@@ -101,27 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Mysz</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add or configure other pointing devices, tablets, trackballs
 etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Karta dźwiękowa</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The
-option to select a different driver is only given when there is more than
-one driver for your card, but where none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Graphical interface</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphic card(s) and displays.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">For more information, see <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -136,11 +158,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Sieć</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, using the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
@@ -150,14 +172,14 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxies</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
         <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
-internet.  This section allows you to configure your computer to utilize a
+Internet.  This section allows you to configure your computer to utilize a
 proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -169,26 +191,31 @@ need to enter here.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Poziom Bezpieczeństwa</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Here you set the Security level for your computer, in most cases the default
-setting (Standard) is adequate for general use.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Check the option which best suits your usage.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Firewall</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">A firewall is intended to be a barrier between your important data and the
-rascals out there on the internet who would compromise or steal it.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing everything (no firewall) may be very risky.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/pl/reboot.xml b/docs/docs/stable/installer/pl/reboot.xml
index c5f8593b..1392ae3f 100644
--- a/docs/docs/stable/installer/pl/reboot.xml
+++ b/docs/docs/stable/installer/pl/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="pl" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Uruchom ponownie</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/pl/securityLevel.xml b/docs/docs/stable/installer/pl/securityLevel.xml
index 97ebc93e..ba5fb17e 100644
--- a/docs/docs/stable/installer/pl/securityLevel.xml
+++ b/docs/docs/stable/installer/pl/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Poziom bezpieczeństwa</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended
-setting for the average user. The <emphasis role="bold">Secure</emphasis>
-setting will create a highly protected system - for instance if the system
-is to be used as a public server.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Security Administrator</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
 which require notification to a system administrator.</para>
 
-  <para>A good, and easy-to-implement, choice is to enter &lt;user>@localhost -
-where &lt;user> is the login name of the user to receive these messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
 be configured for receiving such mail!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/pl/selectCountry.xml b/docs/docs/stable/installer/pl/selectCountry.xml
index 268efd4b..853ab1ed 100644
--- a/docs/docs/stable/installer/pl/selectCountry.xml
+++ b/docs/docs/stable/installer/pl/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="pl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="pl">
   <info>
     <title xml:id="selectCountry-ti1">Wybierz twój Kraj / Region</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> option and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem that a country from the
-first list was chosen. Please ignore this, as DrakX will apply your actual
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,7 +40,7 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Metoda wejścia</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
@@ -39,9 +50,9 @@ selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via <emphasis role="bold">Configure
-your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
-running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/selectInstallClass.xml b/docs/docs/stable/installer/pl/selectInstallClass.xml
index 6a43c20b..0aa0b522 100644
--- a/docs/docs/stable/installer/pl/selectInstallClass.xml
+++ b/docs/docs/stable/installer/pl/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="pl" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Instalacja czy uaktualnienie</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Zainstaluj</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option to perform a fresh installation of
-<application>Mageia</application>. This will format the root partition (/),
-but can preserve a separated /home partition.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Uaktualnienie</para>
-
-      <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that has reached
-its End Of Life, then it is better to do a clean install instead while
-preserving your <literal>/home</literal> partition.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that, and only if you are very sure
-rebooting is what you want, go to a text terminal by pressing <guilabel>Alt
-Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the <emphasis role="bold">Install or Upgrade</emphasis>
-screen to the language choice screen by pressing <guilabel>Alt Ctrl
-Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do
-this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pl/selectKeyboard.xml b/docs/docs/stable/installer/pl/selectKeyboard.xml
index 13c42eee..7d49aef4 100644
--- a/docs/docs/stable/installer/pl/selectKeyboard.xml
+++ b/docs/docs/stable/installer/pl/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,20 +19,23 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Klawiatura</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX wybiera odpowiedni układ klawiatury do twojego języka. Jeśli nie
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX wybiera odpowiedni układ klawiatury do twojego języka. Jeśli nie
 znaleziono odpowiedniego układu klawiatury, wybrany będzie domyślny układ
 klawiatury US.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Upewnij się, że zaproponowany wybór jest odpowiedni lub wybierz inny układ
+      <para revision="1" xml:id="selectKeyboard-pa2">Upewnij się, że zaproponowany wybór jest odpowiedni lub wybierz inny układ
 klawiatury. Jeśli nie wiesz jaki układ jest odpowiedni dla twojej
 klawiatury, sprawdź dokumentację lub zapytaj dostawcę sprzętu. Może się
 zdarzyć że na klawiaturze znajdziesz etykietę z potrzebną informacją. Możesz
@@ -28,23 +44,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a fuller list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this and
-continue the installation: the keyboard chosen from the full list will be
-applied.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
 extra dialogue screen asking how you would prefer to switch between the
 Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pl/selectKeyboardLive.xml b/docs/docs/stable/installer/pl/selectKeyboardLive.xml
index ae6ed61e..df7be47e 100644
--- a/docs/docs/stable/installer/pl/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/pl/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Wybierz klawiaturę</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>You will be required to set the keyboard layout you wish to use in
-Mageia​​. The default one is selected according to your language and
-timezone previously selected.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/pl/selectLanguage.xml b/docs/docs/stable/installer/pl/selectLanguage.xml
index c0a11971..02d0fd76 100644
--- a/docs/docs/stable/installer/pl/selectLanguage.xml
+++ b/docs/docs/stable/installer/pl/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pl" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,51 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Wybór języka</title>
   </info>
 
-  <para condition="classical">Wybierz preferowany język, najpierw rozwijając listę dla swojego
-kontynentu. <application>Mageia</application> będzie używać wybranego języka
-zarówno podczas instalacji jak i w zainstalowanym systemie.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">If it is likely that you (or others) will require several languages to be
-installed on your system, then you should use the <guibutton>Multiple
-languages</guibutton> option to add them now. It will be difficult to add
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
 extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
+  <important condition="classical">
     <para>Even if you choose more than one language, you must first choose one as your
-preferred language in the first language screen. It will also be marked as
-chosen in the multiple languages screen.</para>
-  </warning>
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
-      <para>Jeśli język twojej klawiatury nie jest taki sam jak język, który wybierasz
-jako domyślny, należy zainstalować także język odpowiedni do twojej
-klawiatury.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia używa wsparcia UTF-8 (Unicode) domyślnie.</para>
-
-      <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple
-languages</emphasis> screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>Po instalacji możesz zmienic domyslny język uzywany w systemie za pomocą
-Centrum Sterowania Mageia -> System -> Zarządzanie lokalizacją systemu</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pl/selectMouse.xml b/docs/docs/stable/installer/pl/selectMouse.xml
index 7fb2a1d6..6b61ca45 100644
--- a/docs/docs/stable/installer/pl/selectMouse.xml
+++ b/docs/docs/stable/installer/pl/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="pl">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Wybierz mysz</title>
   </info>
@@ -7,25 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Jeżeli nie jesteś zadowolony z tego, jak mysz reaguje, możesz wybrać inną
 tutaj.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB
-mice</guilabel> is a good choice.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to
-configure the buttons that do not work on a mouse with six or more buttons.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/pl/setupBootloader.xml b/docs/docs/stable/installer/pl/setupBootloader.xml
index e646bd7b..2e165380 100644
--- a/docs/docs/stable/installer/pl/setupBootloader.xml
+++ b/docs/docs/stable/installer/pl/setupBootloader.xml
@@ -1,146 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="pl" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="pl" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Podstawowe opcje programu rozruchowego</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Bootloader interface</title>
-    <para>By default, Mageia uses exclusively:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot
-choose between the <emphasis role="bold">with</emphasis> or <emphasis
-role="bold">without graphical menu</emphasis> options.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to house the bootloader
-(GRUB2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds GRUB2-efi. Although it is possible to have
-several ESPs, only one is required (and advised), whatever the number of
-operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Używanie bootloader'a Magei</title>
-    <para>By default, and according to your system, Mageia writes one of the
-following:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then untick the <emphasis
-role="bold">Probe Foreign OS</emphasis> option.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
   <section>
-    <title>Użyj istniejącego bootloader'a.</title>
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this documentation, however in most cases it will
-involve running the relevant bootloader installation program which should
-detect and add it automatically. See the documentation for the operating
-system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Opcje</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>First page</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you
-set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be required when booting
-to select a booting entry or change settings. The username is <emphasis
-role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will
-check that it matches with the one above.</para></listitem><listitem><para><guilabel>Advanced</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for power management. It can save energy by
-stopping unused devices.  Deselecting it could be useful if, for example,
-your computer does not support ACPI or if you think the ACPI implementation
-might cause some problems (for instance random reboots or system lockups).</para></listitem><listitem><para><guilabel>Enable SMP</guilabel>: This option enables/disables symmetric
-multiprocessing for multi core processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the operating system access to
-the Advanced Programmable Interrupt Controller. APIC devices permit more
-complex priority models, and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC manages all external
-interrupts for a specific processor in an SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Podstawowe opcje programu rozruchowego</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Next page</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-to be used by the boot menu. If you click the down triangle you will be
-offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Użyj istniejącego bootloader'a.</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Dodaj lub zmodyfikuj wpis Boot Menu</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/setupSCSI.xml b/docs/docs/stable/installer/pl/setupSCSI.xml
index 90d92adc..99bb9558 100644
--- a/docs/docs/stable/installer/pl/setupSCSI.xml
+++ b/docs/docs/stable/installer/pl/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Wykrywanie SCSI</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
 SCSI controllers it may be unable to determine the correct drivers to use
 and subsequently fail to recognise the drive.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s)
-you have.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">DrakX powinien być wtedy w stanie odpowiednio skonfigurować  dysk(i).</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/pl/software.xml b/docs/docs/stable/installer/pl/software.xml
new file mode 100644
index 00000000..f6d0209c
--- /dev/null
+++ b/docs/docs/stable/installer/pl/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="pl" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pl/soundConfig.xml b/docs/docs/stable/installer/pl/soundConfig.xml
index bc8c0726..d26789b2 100644
--- a/docs/docs/stable/installer/pl/soundConfig.xml
+++ b/docs/docs/stable/installer/pl/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Konfiguracja dźwięku</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if one exists.</para>
+  
 
-  <para>The default driver should work without problems. However, if after install
-you do encounter problems, then run <command>draksound</command> or start
-this tool via MCC (Mageia Control Center), by choosing the
-<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound
-Configuration</guilabel> at the top right of the screen.</para>
+  
 
-  <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis
-role="bold">Sound Configuration</emphasis> tool screen, click on
-<guibutton>Troubleshooting</guibutton> to find useful advice about how to
-solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Zaawansowane</title>
     </info>
 
-    <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in
-this screen, during install, is useful if there is no default driver and
-there are several drivers available, but you think the installer selected
-the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on <emphasis
-role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pl/takeOverHdConfirm.xml b/docs/docs/stable/installer/pl/takeOverHdConfirm.xml
index 94ee46eb..93865f05 100644
--- a/docs/docs/stable/installer/pl/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/pl/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Formatowanie twardego dysku</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is
-ok to erase every partition, every operating system and all data that might
-be on that hard disk.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/pl/testing.xml b/docs/docs/stable/installer/pl/testing.xml
index 7956d601..35935860 100644
--- a/docs/docs/stable/installer/pl/testing.xml
+++ b/docs/docs/stable/installer/pl/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Testowanie Magei w systemie Live</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testowanie Magei w systemie Live</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Tryb Live</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>You get this screen if you selected "Boot Mageia". If not, you get the
-"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Testowanie sprzętu</title>
       </info>
 
-      <para>One of the Live mode goals is to test if the hardware is correctly managed
-by Mageia. You can check if all devices have a driver in the Hardware
-section of the Mageia Control Center. You can test the most current devices:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>karta graficzna: jeżeli widzisz poprzedni ekran, wszystko jest OK</para>
-        </listitem>
-
-        <listitem>
-          <para>kamera internetowa:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>drukarka: skonfiguruj ją oraz wydrukuj stronę testową</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
       </itemizedlist>
 
-      <para>If all is OK for you, you can process to the installation. If not, you can
-leave with the quit button.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>Ustawienia konfiguracyjny, które dokonałeś tutaj pozostają dla instalacji.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,15 +68,14 @@ leave with the quit button.</para>
         <title xml:id="testing3-ti1">Uruchom instalację</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
-SSD drive, simply click on the icon "Install on Hard Disk". You will get
-this screen, and then the "<link
-linkend="doPartitionDisks">Partitioning</link> step" as for the direct
-installation.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/pl/uninstall-Mageia.xml b/docs/docs/stable/installer/pl/uninstall-Mageia.xml
index 4d053e67..7d1efd45 100644
--- a/docs/docs/stable/installer/pl/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/pl/uninstall-Mageia.xml
@@ -1,30 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="pl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pl" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Usuwanie Magei</title>
   </info>
 
   
 
+  
+
   <para>If Mageia didn't convince you or you can't install it correctly - in short
 you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-  <para>After your data backup, reboot your Mageia installation DVD and select
-<emphasis role="bold">Rescue system</emphasis>, then, <emphasis
-role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
-will only have Windows, with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>In Windows to recover the space used by Mageia partitions: click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code>. You will recognize a Mageia partition
-because they are labeled <guilabel>Unknown</guilabel>, and also by their
-size and place on the disk. Right click on each of these partitions and
-select <guibutton>Delete</guibutton> to free up the space.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
   <para>If you are using Windows XP, you can create a new partition and format it
-(FAT32 or NTFS). It will get a partition letter.</para>
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>If you have Vista or 7, you have one more possibility, you can extend the
 existing partition that is at the left of the freed space. There are other
@@ -32,4 +45,4 @@ partitioning tools that can be used, such as <emphasis
 role="bold">gparted</emphasis>, available for both Windows and Linux. As
 always, when changing partitions, be very careful to back up anything
 important to you.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pl/unused.xml b/docs/docs/stable/installer/pl/unused.xml
index a72f5ac1..001d28d6 100644
--- a/docs/docs/stable/installer/pl/unused.xml
+++ b/docs/docs/stable/installer/pl/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pl" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="pl">
   <info>
     <title xml:id="unused-ti1">Zostaw lub usuń nieużywany materiał</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para>In this step, the installer looks for unused locales packages and unused
-hardware packages. Then it proposes you to delete them. It is a good idea to
-accept, except if you prepare an installation which has to run on different
-hardware.</para>
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
+
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>The next step is the copying of files on hard disk. This takes some
-minutes. At the end, you get a blank screen for some time, it's normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/pt/DrakLive-cover.xml b/docs/docs/stable/installer/pt/DrakLive-cover.xml
new file mode 100644
index 00000000..e256a182
--- /dev/null
+++ b/docs/docs/stable/installer/pt/DrakLive-cover.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="pt" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
+  <info>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Instalação a partir do disco LIVE</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
+        <revremark>Mageia 5</revremark>
+      </revision>
+    </revhistory>
+
+    <cover>
+      <para role="tagline">The Official Documentation for Mageia</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>
+    </cover>
+  </info>
+
+  <article>
+    <title>Instalação a partir do disco LIVE</title>
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the choices you make
+while installing.</para>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
+
+    <xi:include href="acceptLicense.xml"/>
+
+    <xi:include href="configureTimezoneUTC.xml"/>
+
+    <xi:include href="bestTime.xml"/>
+
+    <xi:include href="selectKeyboardLive.xml"/>
+
+    <xi:include href="testing.xml"/>
+
+    <xi:include href="diskPartitioning.xml"/>
+
+    
+
+    <!-- <xi:include href="doPartitionDisks.xml"/>
+
+
+    <xi:include href="ask_mntpoint_s.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
+
+    <xi:include href="diskdrake.xml"/>
+
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
+
+    <xi:include href="setupBootloader.xml"/>
+
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
+
+    <xi:include href="addUser.xml"/>
+
+    <xi:include href="login.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/pt/DrakLive.xml b/docs/docs/stable/installer/pt/DrakLive.xml
new file mode 100644
index 00000000..e7f7c09e
--- /dev/null
+++ b/docs/docs/stable/installer/pt/DrakLive.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="pt" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  <info>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Instalação a partir do disco LIVE</title>
+
+    <cover>
+      <para><note>
+          <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the 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>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>
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="bootLive.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="bestTime.xml"/>
+
+  <xi:include href="selectKeyboardLive.xml"/>
+
+  <xi:include href="testing.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="login.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
diff --git a/docs/docs/stable/installer/pt/DrakX-cover.xml b/docs/docs/stable/installer/pt/DrakX-cover.xml
new file mode 100644
index 00000000..cf9a7219
--- /dev/null
+++ b/docs/docs/stable/installer/pt/DrakX-cover.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="pt" xml:id="Quick-Startup"
+      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 DrakX</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>February 2014</date>
+
+        <revremark>Mageia 4</revremark>
+      </revision>
+    </revhistory>
+
+    <cover>
+      <para role="tagline">The Official Documentation for Mageia</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>
+    </cover>
+  </info>
+
+  <article>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
+<title>Installation with DrakX</title>
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the choices you make
+while installing.</para>
+      </note></para>
+
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="installer.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
+
+    <xi:include href="acceptLicense.xml"/>
+
+    <xi:include href="setupSCSI.xml"/>
+
+    <xi:include href="selectInstallClass.xml"/>
+
+    <xi:include href="selectKeyboard.xml"/>
+
+    
+
+    
+
+    
+
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
+
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
+
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+    <xi:include href="software.xml"/>
+
+    
+
+    <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+    <xi:include href="graphicalConfiguration.xml"/>
+
+    
+
+    <!-- <xi:include href="configureX_card_list.xml"/>
+
+
+    <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
+
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+    <xi:include href="locale.xml"/>
+
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
+
+
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
+
+    <xi:include href="selectMouse.xml"/>
+
+    <xi:include href="soundConfig.xml"/>
+
+    <xi:include href="securityLevel.xml"/>
+
+    <xi:include href="firewall.xml"/>
+
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
+</xi:include> -->
+<xi:include href="installUpdates.xml"/>
+
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/pt/DrakX-inline.xml b/docs/docs/stable/installer/pt/DrakX-inline.xml
new file mode 100644
index 00000000..43646b4d
--- /dev/null
+++ b/docs/docs/stable/installer/pt/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="pt" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Installation with DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the 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>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>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/DrakX.xml b/docs/docs/stable/installer/pt/DrakX.xml
new file mode 100644
index 00000000..cf1b3fda
--- /dev/null
+++ b/docs/docs/stable/installer/pt/DrakX.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="pt" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Installation with DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the 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>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>
+    </cover>
+  </info>
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  
+
+  
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
+
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
+
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="graphicalConfiguration.xml"/>
+
+  
+
+  <!-- <xi:include href="configureX_chooser.xml"/>
+
+  
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+  
+
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
+
+
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:include> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
diff --git a/docs/docs/stable/installer/pt/SelectAndUseISOs2.xml b/docs/docs/stable/installer/pt/SelectAndUseISOs2.xml
new file mode 100644
index 00000000..9d0c3549
--- /dev/null
+++ b/docs/docs/stable/installer/pt/SelectAndUseISOs2.xml
@@ -0,0 +1,384 @@
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="pt" xml:id="Select-and-use-ISOs">
+  
+  
+  
+  
+  
+  
+  
+  <info>
+    <!-- Made by Lebarhon 2014 03 26 
+
+Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
+<title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
+  </info>
+  <section>
+    <title>Introdução</title>
+    <para>Mageia is distributed via ISO images. This page will help you to choose
+which image best suits your needs.</para>
+    <para>There are three types of installation media:</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
+      </listitem>
+    </itemizedlist>
+    <para>More details are given in the next sections.</para>
+  </section>
+  <section>
+    <title>Media</title>
+    <section>
+      <title>Definition</title>
+      <para>Here, a medium (plural: media) is an ISO image file that allows you to
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
+      <para>You can find Mageia ISO's <link
+ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
+    </section>
+    <section>
+      <title>Classical installation media</title>
+      <section>
+        <title>Common features</title>
+        <itemizedlist>
+          <listitem>
+            <para>These ISOs use the Classical installer called DrakX</para>
+          </listitem>
+          <listitem>
+            <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
+          </listitem>
+          <listitem>
+            <para>Different media for 32 and 64-bit architectures</para>
+          </listitem>
+          <listitem>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
+          </listitem>
+          <listitem>
+            <para>Each DVD contains many available desktop environments and languages</para>
+          </listitem>
+          <listitem>
+            <para>You'll be given the choice during the installation to add non-free software</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+    </section>
+    <section>
+      <title>Live media</title>
+      <section>
+        <title>Common features</title>
+        <itemizedlist>
+          <listitem>
+            <para>Can be used to preview the Mageia operating system without having to install
+it</para>
+          </listitem>
+          <listitem>
+            <para>The Live media also includes an Installer.</para>
+          </listitem>
+          <listitem>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
+          </listitem>
+          <listitem>
+            <para>Different media for 32 and 64-bit architectures</para>
+          </listitem>
+          <listitem>
+            <para>They contain non-free software</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+      <section>
+        <title>Live DVD Plasma</title>
+        <itemizedlist>
+          <listitem>
+            <para>Plasma desktop environment only</para>
+          </listitem>
+          <listitem>
+            <para>All available languages are present</para>
+          </listitem>
+          <listitem>
+            <para>64-bit architecture only</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+      <section>
+        <title>Live DVD GNOME</title>
+        <itemizedlist>
+          <listitem>
+            <para>GNOME desktop environment only</para>
+          </listitem>
+          <listitem>
+            <para>All available languages are present</para>
+          </listitem>
+          <listitem>
+            <para>64-bit architecture only</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+      <section>
+        <title>Live DVD Xfce</title>
+        <itemizedlist>
+          <listitem>
+            <para>Xfce desktop environment only</para>
+          </listitem>
+          <listitem>
+            <para>All available languages are present</para>
+          </listitem>
+          <listitem>
+            <para>32 or 64-bit architectures</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+    </section>
+    <section>
+      <title>Net install media</title>
+      <section>
+        <title>Common features</title>
+        <itemizedlist>
+          <listitem>
+            <para>Different media for 32 and 64-bit architectures</para>
+          </listitem>
+          <listitem>
+            <para>First steps are English language only</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+      <section>
+        <title>netinstall.iso</title>
+        <itemizedlist>
+          <listitem>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+      <section>
+        <title>netinstall-nonfree.iso</title>
+        <itemizedlist>
+          <listitem>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+    </section>
+  </section>
+  <section>
+    <title>Downloading and Checking Media</title>
+    <section>
+      <title>Downloading</title>
+      <para>Once you have chosen your ISO file, you can download it using either http or
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
+    </section>
+    <section>
+      <title xml:id="integrity">Checking the integrity of the downloaded media</title>
+      <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
+      <para>To generate the checksum for your downloaded ISO, open a console, (no need
+to be root), and:</para>
+      <itemizedlist>
+        <listitem>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+        <listitem>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+      </itemizedlist>
+      <para>Example:</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
+    </section>
+  </section>
+  <section>
+    <title>Burn or dump the ISO</title>
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
+    <section>
+      <title>Burning the ISO to a CD/DVD</title>
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
+ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
+wiki</link> for more information.</para>
+    </section>
+    <section>
+      <title>Dump the ISO to a USB stick</title>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
+      <warning>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
+      </warning>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
+      <section>
+        <title>Using a graphical tool within Mageia</title>
+        <para>You can use a graphical tool like <link
+ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
+      </section>
+      <section>
+        <title>Using a graphical tool within Windows</title>
+        <para>You could try:</para>
+        <itemizedlist>
+          <listitem>
+            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
+          </listitem>
+          <listitem>
+            <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
+Imager</link></para>
+          </listitem>
+        </itemizedlist>
+      </section>
+      <section>
+        <title>Using the Command line within a GNU/Linux system</title>
+        <warning>
+          <para>It is potentially *dangerous* to do this by hand. You risk overwriting
+potentially valuable existing data if you specify the wrong target device.</para>
+        </warning>
+        <orderedlist>
+          <listitem>
+            <para>Open a console</para>
+          </listitem>
+          <listitem>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
+            <mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
+          </listitem>
+          <listitem>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
+          </listitem>
+          <listitem>
+            <para>Enter the command <command>fdisk -l</command></para>
+            <mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
+          </listitem>
+          <listitem>
+            <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+            <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
+            <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
+[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+[72594.770536] usb 1-1: Product: Mass Storage Device
+[72594.770537] usb 1-1: Manufacturer: JetFlash
+[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB
+[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected
+[72594.772447] scsi host8: usb-storage 1-1:1.0
+[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 PQ: 0 ANSI: 4
+[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)
+[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off
+[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00
+[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
+[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
+[72595.967251]  <emphasis>sdd</emphasis>: sdd1
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
+          </listitem>
+          <listitem>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
+            <tip>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
+            </tip>
+          </listitem>
+          <listitem>
+            <para>Enter the command: <command>sync</command></para>
+          </listitem>
+          <listitem>
+            <para>This is the end of the process, and you may now unplug your USB stick.</para>
+          </listitem>
+        </orderedlist>
+      </section>
+    </section>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/acceptLicense.xml b/docs/docs/stable/installer/pt/acceptLicense.xml
new file mode 100644
index 00000000..5a23a480
--- /dev/null
+++ b/docs/docs/stable/installer/pt/acceptLicense.xml
@@ -0,0 +1,98 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="acceptLicense" version="5.0" xml:lang="pt">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 27 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- JohnR: minor mods 2012-3-30 -->
+<!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
+<!-- JohnR: 2012-04-05 - Inserted text from barjac with some modifications:
+       http://mtf.no-ip.co.uk/doc/help/license.html  -->
+<!-- marja:2012-04-05 - having a look because this isn't a DocBook5.0 type anymore,
+       but text/xml. First changing centimetres in screenshot to pixels ( 
+       ), after that nested the two existing sections into a third one-->
+<!-- removed para id's, corrected duplicate id's for segments, marja, 20120409 -->
+<!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
+       sure what is causing the corruption -->
+<!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
+<title xml:id="acceptLicense-ti1">Licença e Notas de Lançamento</title>
+  </info>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="acceptLicense-im1" fileref="dx2-license.png" align="center"
+revision="4"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-license.png" xml:id="acceptLicense-im2" revision="5"
+align="center" condition="live"/> </imageobject></mediaobject>
+
+  <section xml:id="license">
+    <info>
+      <title xml:id="license-ti1">Acordo da Licença</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
+
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
+
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
+
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
+
+    
+  <!-- if you want two sections in a file, both need to be nested in a third section -
+       marja, 20120405  -->
+</section>
+
+  <section xml:id="releaseNotes">
+    <!--
+  <para>
+Release Notes</para>
+-->
+<info>
+      <title xml:id="releaseNotes-ti1">Notas de Lançamento</title>
+    </info>
+
+    
+
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/addUser.xml b/docs/docs/stable/installer/pt/addUser.xml
new file mode 100644
index 00000000..a927561d
--- /dev/null
+++ b/docs/docs/stable/installer/pt/addUser.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="addUser-ti1">User Management</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
+  <section xml:id="root-password">
+    <info>
+      <title xml:id="root-password-ti2">Definir Senha de Administrador (raiz):</title>
+    </info>
+
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
+
+    <note xml:id="givePassword">
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
+    </note>
+  </section>
+
+  <section xml:id="enterUser">
+    <info>
+      <title xml:id="enterUser-ti3">Indique um utilizador</title>
+    </info>
+
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
+
+        <para>Click on this button if you want to change the user's icon</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
+
+      <para>You can add any extra needed users in the <emphasis>Configuration -
+Summary</emphasis> step during the install. Choose <emphasis>User
+management</emphasis>.</para>
+
+      <para>As permissões de acesso, também podem ser alteradas depois da instalação.</para>
+    </note>
+  </section>
+
+  <section condition="classical" xml:id="addUserAdvanced">
+    <info>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
+    </info>
+
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/pt/add_supplemental_media.xml b/docs/docs/stable/installer/pt/add_supplemental_media.xml
new file mode 100644
index 00000000..f760e4ab
--- /dev/null
+++ b/docs/docs/stable/installer/pt/add_supplemental_media.xml
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="pt">
+  <info>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- papoteur 2013-04-13  - created -->
+<!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
+<!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
+<imageobject> <imagedata format="PNG"
+fileref="dx2-add_supplemental_media.png"
+xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
+
+  <para>Para uma rede fonte, existem 2 passos a seguir:</para>
+
+  <orderedlist>
+    <listitem>
+      <para>Choosing and activating the network, if not already up.</para>
+    </listitem>
+
+    <listitem>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
+    </listitem>
+  </orderedlist>
+
+  <note>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/ask_mntpoint_s.xml b/docs/docs/stable/installer/pt/ask_mntpoint_s.xml
new file mode 100644
index 00000000..d15aa961
--- /dev/null
+++ b/docs/docs/stable/installer/pt/ask_mntpoint_s.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="ask_mntpoint_s-ti1">Escolher os pontos de montagem</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Made by marja on 2012 03 28 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
+<!-- removed para xml:id's, marja, 20120409 -->
+<!-- barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
+       with "a", as I can't imagine having more than one root partition ;) -->
+<!-- Lebarhon : I put [] where it seems having mistakes -->
+<!-- Marja: you're right, in English English it is "its type", however, the Americans
+       write "it's type". And you're right about the redundant part, too, I removed it-->
+<!-- And JohnR says the Americans are WRONG! :-)) -->
+<!-- 2012-04-19  Language proofreading done -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
+    </listitem>
+
+    <listitem>
+      <para>For any partitions that you don't need to make use of, you can leave the
+mount point field blank.</para>
+    </listitem>
+  </itemizedlist>
+
+  <warning>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
+  </warning>
+
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt/bestTime.xml b/docs/docs/stable/installer/pt/bestTime.xml
new file mode 100644
index 00000000..f079c682
--- /dev/null
+++ b/docs/docs/stable/installer/pt/bestTime.xml
@@ -0,0 +1,17 @@
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="pt" xml:id="bestTime">
+  
+  
+  <info>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
+  </info>
+  <mediaobject condition="live">
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/bootLive.xml b/docs/docs/stable/installer/pt/bootLive.xml
new file mode 100644
index 00000000..f2351c6d
--- /dev/null
+++ b/docs/docs/stable/installer/pt/bootLive.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Booting the medium</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>First screen while booting in BIOS mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">In UEFI mode</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/pt/chooseDesktop.xml b/docs/docs/stable/installer/pt/chooseDesktop.xml
new file mode 100644
index 00000000..f533e568
--- /dev/null
+++ b/docs/docs/stable/installer/pt/chooseDesktop.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<info>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Selecção de Ecrã</title>
+  </info>
+
+  
+
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
+
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
+
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/pt/choosePackageGroups.xml b/docs/docs/stable/installer/pt/choosePackageGroups.xml
new file mode 100644
index 00000000..0d939b0d
--- /dev/null
+++ b/docs/docs/stable/installer/pt/choosePackageGroups.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
+  <info>
+    <title xml:id="choosePackageGroups-ti1">Selecção dos Grupos de Pacotes</title>
+  </info>
+
+  
+
+  
+
+  <mediaobject>
+<!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
+align="center"/> </imageobject></mediaobject>
+
+  <para>Packages are arranged into common groups, to make choosing what you need on
+your system a lot easier. The groups are fairly self explanatory, however
+more information about the content of each is available in tool-tips which
+become visible as the mouse is hovered over them.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para><emphasis role="bold">Workstation</emphasis></para>
+    </listitem>
+
+    <listitem>
+      <para><emphasis role="bold">Server</emphasis></para>
+    </listitem>
+
+    <listitem>
+      <para><emphasis role="bold">Graphical Environment</emphasis></para>
+    </listitem>
+
+    <listitem>
+      <para><emphasis role="bold">Individual Package Selection</emphasis>: you can use
+this option to manually add or remove packages</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>See <xref linkend="minimal-install"/> for instructions on how to do a
+minimal install (without or with X &amp; IceWM).</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/choosePackagesTree.xml b/docs/docs/stable/installer/pt/choosePackagesTree.xml
new file mode 100644
index 00000000..3d251922
--- /dev/null
+++ b/docs/docs/stable/installer/pt/choosePackagesTree.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="pt">
+  <info>
+    <title xml:id="choosePackagesTree-ti1">Seleção de Pacotes Individuas</title>
+  </info>
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
+align="center"/> </imageobject></mediaobject>
+
+  <para>Here you can add or remove any extra packages to customize your
+installation.</para>
+
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/configureServices.xml b/docs/docs/stable/installer/pt/configureServices.xml
new file mode 100644
index 00000000..6fc892aa
--- /dev/null
+++ b/docs/docs/stable/installer/pt/configureServices.xml
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="pt" xml:id="configureServices">
+  <info>
+    <title xml:id="configureServices-ti1">Configure os seus serviços</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
+<!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
+xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
+
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">If you highlight a service, some information about it is shown in the info
+box below.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para xml:id="configureServices-pa5" revision="1">Only change things when you know very well what you are doing.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/configureTimezoneUTC.xml b/docs/docs/stable/installer/pt/configureTimezoneUTC.xml
new file mode 100644
index 00000000..1a1e2d9d
--- /dev/null
+++ b/docs/docs/stable/installer/pt/configureTimezoneUTC.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="pt">
+  <info>
+    <title xml:id="configureTimezoneUTC-ti6">Configure o seu fuso horário?</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
+<!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="configureTimezoneUTC-im1" align="center"
+fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
+or to GMT, also known as UTC.</para>
+
+  <note>
+    <para revision="1" xml:id="configureTimezoneUTC-pa3">If you have more than one operating system on your computer, make sure they
+are all set to local time, or all to UTC/GMT.</para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/configureX_card_list.xml b/docs/docs/stable/installer/pt/configureX_card_list.xml
new file mode 100644
index 00000000..4aadb702
--- /dev/null
+++ b/docs/docs/stable/installer/pt/configureX_card_list.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!-- Initiated by Marja  2012-08-08 -->
+<!-- Further text JohnR  2012-08-29 -->
+<!-- tproof  -->
+<!-- lproof  -->
+<!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
+
+  <para>DrakX has a very comprehensive database of video cards and will usually
+correctly identify your video device.</para>
+
+  <para>If the installer has not correctly detected your graphic card and you know
+which one you have, you can select it from the tree by: <itemizedlist>
+      <listitem>
+        <para>Vendor</para>
+      </listitem>
+
+      <listitem>
+        <para>then the make of your card</para>
+      </listitem>
+
+      <listitem>
+        <para>and the model of card</para>
+      </listitem>
+    </itemizedlist></para>
+
+  <para>If you cannot find your card in the vendor lists (because it's not yet in
+the database or it's an older card) you may find a suitable driver in the
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
+
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
+
+  <para>Some video card manufacturers provide proprietary drivers for Linux which
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt/configureX_chooser.xml b/docs/docs/stable/installer/pt/configureX_chooser.xml
new file mode 100644
index 00000000..85edb36c
--- /dev/null
+++ b/docs/docs/stable/installer/pt/configureX_chooser.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="configureX_chooser-ti1">Configuração da Placa Gráfica e do Monitor</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
+
+  <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
+    </listitem>
+  </itemizedlist>
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/pt/configureX_monitor.xml b/docs/docs/stable/installer/pt/configureX_monitor.xml
new file mode 100644
index 00000000..f8722f0a
--- /dev/null
+++ b/docs/docs/stable/installer/pt/configureX_monitor.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!-- Initiated by Marga 2012-8-09 -->
+<!-- Further text JohnR  2012-08-30 -->
+<!-- tproof -->
+<!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
+<title xml:id="configureX_monitor-ti1">Escolha o seu Monitor</title>
+  </info>
+
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX has a very comprehensive database of monitors and will usually
+correctly identify yours.</para>
+
+  <warning>
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
+could damage your monitor or video hardware. Please don't try something
+without knowing what you are doing.</emphasis> If in doubt you should
+consult your monitor documentation.</para>
+  </warning>
+
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
+
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
+
+        <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
+type with a sync range that is beyond the capabilities of your monitor: you
+may damage your monitor. If in doubt, choose a conservative setting and
+consult your monitor documentation.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can select it from the tree by selecting:</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
+
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
+
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/pt/diskPartitioning.xml b/docs/docs/stable/installer/pt/diskPartitioning.xml
new file mode 100644
index 00000000..7ac2d624
--- /dev/null
+++ b/docs/docs/stable/installer/pt/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="pt" version="5.0" xml:lang="pt">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/diskdrake.xml b/docs/docs/stable/installer/pt/diskdrake.xml
new file mode 100644
index 00000000..b000ee1b
--- /dev/null
+++ b/docs/docs/stable/installer/pt/diskdrake.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+    
+    
+
+  <info>
+    <!-- Lebarhon 2016 12 16 updated for Mageia 6
+
+Lebarhon 20170902 added SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
+  </info>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
+
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
+
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
+
+  <figure>
+    <title>EFI System Partition</title>
+
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
+
+  <figure>
+    <title>BIOS boot partition</title>
+
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/pt/doPartitionDisks.xml b/docs/docs/stable/installer/pt/doPartitionDisks.xml
new file mode 100644
index 00000000..5ff76ab8
--- /dev/null
+++ b/docs/docs/stable/installer/pt/doPartitionDisks.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
+lebarhon 20170209 added SC-->
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
+  </info>
+
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa5">Se esta opção estiver disponível, e as partições compatíveis de Linux
+existentes forem encontradas, estas poderão ser utilizadas para a
+instalação.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa7">If you have unused space on your hard drive then this option will use it for
+your new Mageia installation.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
+
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
+
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
+partition must be "clean", meaning that Windows must have closed down
+correctly the last time it was used. It must also have been defragmented,
+although this is not a guarantee that all files in the partition have been
+moved out of the area that is about to be used. It is highly recommended to
+back up your personal files.</para>
+      </important>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa17">This gives you complete control over the placing of the installation on your
+hard drive(s).</para>
+    </listitem>
+  </itemizedlist>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
+
+  <note>
+    <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
+  </note>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
+
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+
+  <important>
+    <para>Some newer drives are now using 4096 byte logical sectors, instead of the
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Also make sure all partitions are created using an even number of megabytes.</para>
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/pt/exitInstall.xml b/docs/docs/stable/installer/pt/exitInstall.xml
new file mode 100644
index 00000000..e011f2b7
--- /dev/null
+++ b/docs/docs/stable/installer/pt/exitInstall.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0" xml:lang="pt">
+  <info>
+    <title xml:id="exitInstall-ti1">Parabéns</title>
+  </info>
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
+<imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
+align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
+
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
+
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
+
+  <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the settings for the bootloader, your Mageia install
+will be automatically selected and started.</para>
+
+  <para xml:id="exitInstall-pa4" revision="1">Aproveite!</para>
+
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/firewall.xml b/docs/docs/stable/installer/pt/firewall.xml
index 658d2550..515ecd2f 100644
--- a/docs/docs/stable/installer/pt/firewall.xml
+++ b/docs/docs/stable/installer/pt/firewall.xml
@@ -1,33 +1,37 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="pt">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="pt" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Firewall</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Firewall</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows to configure some simple firewall rules: they determine
-which type of message from the Internet will be accepted by the target
-system. This, in turn, allows the corresponding services on the system to be
-accessible from the Internet.</para>
+  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+determine which type of message from the Internet will be accepted by the
+target system. This, in turn, allows the corresponding services on the
+system to be accessible from the Internet.</para>
 
-  <para>In the default setting, no button is checked - no service of the system is
-accessibly from the network. The "<emphasis>Everything (no
-firewall)</emphasis>" button has a particular role: it enables access to all
-services of the machine - an option that does not make much sense in the
-context of the installer since it would create a totally unprotected
-system.  Its veritable use is in the context of the Mageia Control Center
-(which uses the same GUI layout) for temporarily disabling the entire set of
-firewall rules for testing and debugging purposes.</para>
+  <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
 
-  <para>All other checkbuttons are more or less self-explanatory. As an example, you
-will check the "CUPS server" button if you want printers on your machine to
-be accessible from the network.</para>
+  <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The set of checkbuttons only comprises the most common services. The
-"Advanced" button allows to enable messages that correspond to a service for
-which no checkbutton exists. The "<emphasis>Advanced</emphasis>" button
-opens a window where you can enable a series of services by typing a list of
-couples (blank separated)</para>
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
 
diff --git a/docs/docs/stable/installer/pt/formatPartitions.xml b/docs/docs/stable/installer/pt/formatPartitions.xml
new file mode 100644
index 00000000..0f7fb51c
--- /dev/null
+++ b/docs/docs/stable/installer/pt/formatPartitions.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="formatPartitions-ti1">Formatação</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Made by marja on 2012 03 29 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- marja 2012-04-24 added screenshot -->
+<!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
+partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
+
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
+
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
+
+  <tip>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
+  </tip>
+
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt/graphicalConfiguration.xml b/docs/docs/stable/installer/pt/graphicalConfiguration.xml
new file mode 100644
index 00000000..5c4a4952
--- /dev/null
+++ b/docs/docs/stable/installer/pt/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/pt/installUpdates.xml b/docs/docs/stable/installer/pt/installUpdates.xml
new file mode 100644
index 00000000..3948b4db
--- /dev/null
+++ b/docs/docs/stable/installer/pt/installUpdates.xml
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="pt">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja, 2012-04-24 added screenshot -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Atualizões</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
+align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+    </listitem>
+
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/installer.xml b/docs/docs/stable/installer/pt/installer.xml
new file mode 100644
index 00000000..0701d908
--- /dev/null
+++ b/docs/docs/stable/installer/pt/installer.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="installer"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, o Instalador do Mageia</title>
+  </info>
+
+  <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
+Installer is designed to help make your installation or upgrade as easy as
+possible.</para>
+
+  <section>
+    <title>Os passos da instalação</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
+
+  <section>
+    <title>Ecrã de Boas-vindas da Instalação</title>
+
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
+
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
+
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
+
+      <itemizedlist>
+        <title>Menu</title>
+
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section>
+      <title>UEFI Systems</title>
+
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
+
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
+
+      <itemizedlist>
+        <title>Menu</title>
+
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Problems and Possible Solutions</title>
+
+    <section>
+      <title>Sem Interface Gráfica</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
+        </listitem>
+
+        <listitem>
+          <para>If the hardware is very old, a graphical installation may not be
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section>
+      <title>The Install Freezes</title>
+
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
+    </section>
+
+    <section>
+      <title>RAM problem</title>
+
+      <para>This will rarely be needed, but in some cases the hardware may report the
+available RAM incorrectly. To specify this manually, you can use the
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
+    </section>
+
+    <section>
+      <title>Dynamic partitions</title>
+
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
+ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/pt/locale.xml b/docs/docs/stable/installer/pt/locale.xml
new file mode 100644
index 00000000..3cb69d0c
--- /dev/null
+++ b/docs/docs/stable/installer/pt/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/pt/login.xml b/docs/docs/stable/installer/pt/login.xml
new file mode 100644
index 00000000..32dc3d72
--- /dev/null
+++ b/docs/docs/stable/installer/pt/login.xml
@@ -0,0 +1,22 @@
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="pt">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/media_selection.xml b/docs/docs/stable/installer/pt/media_selection.xml
new file mode 100644
index 00000000..448c616e
--- /dev/null
+++ b/docs/docs/stable/installer/pt/media_selection.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+  
+  <mediaobject>
+<!-- papoteur 2013-04-11  - created -->
+<!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
+<!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
+<!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
+
+  <para>Here you have the list of available repositories. Not all repositories are
+available, according to which media you use for installing. The repositories
+selection determines which packages will be available for selection during
+the next steps.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>The <emphasis>Core</emphasis> repository cannot be disabled as it contains
+the base of the distribution.</para>
+    </listitem>
+
+    <listitem>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
+    </listitem>
+
+    <listitem>
+      <para>The <emphasis>Tainted</emphasis> repository includes packages released under
+a free license. The main criteria for placing packages in this repository is
+that they may infringe patents and copyright laws in some countries,
+e.g. multimedia codecs needed to play various audio/video files; packages
+needed to play commercial video DVD's, etc.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/pt/minimal-install.xml b/docs/docs/stable/installer/pt/minimal-install.xml
new file mode 100644
index 00000000..f09b4625
--- /dev/null
+++ b/docs/docs/stable/installer/pt/minimal-install.xml
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="pt">
+  <!--2012-12-26 marja - exported this section from choosePackages.xml to
+ start a new page-->
+<!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
+<info>
+    <title xml:id="minimal-install-ti1">Instalação Mínima</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
+xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
+Project</link> and the <link
+xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
+coreutils</link> info pages.</para>
+
+  <mediaobject>
+<imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
+align="center" fileref="dx2-minimal-install.png" revision="1"/>
+</imageobject></mediaobject>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/misc-params.xml b/docs/docs/stable/installer/pt/misc-params.xml
new file mode 100644
index 00000000..b3d42fd9
--- /dev/null
+++ b/docs/docs/stable/installer/pt/misc-params.xml
@@ -0,0 +1,223 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt" xml:id="misc-params">
+  <info>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+  <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
+
+  <note>
+    <para>As a general rule, it is recommended that you accept the default settings
+unless:<itemizedlist>
+        <listitem>
+          <para>there are known issues with a default setting</para>
+        </listitem>
+
+        <listitem>
+          <para>the default setting has already been tried and it fails</para>
+        </listitem>
+
+        <listitem>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
+        </listitem>
+      </itemizedlist></para>
+  </note>
+
+  <section xml:id="misc-params-system">
+    <info>
+      <title xml:id="misc-params-system-ti2">Parâmetros do Sistema</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
+
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
+
+        <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
+setting.  See <xref linkend="selectCountry"/></para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
+
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
+
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
+
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
+
+      <listitem>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
+
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
+      </listitem>
+
+      <listitem>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
+
+        <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
+(daemons).  This tool allows you to enable or disable certain processes.</para>
+
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="misc-params-hardware">
+    <info>
+      <title xml:id="misc-params-hardware-ti3">Parâmetros do Hardware</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
+
+        <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
+of keyboard.</para>
+
+        <note>
+          <para>If you notice a wrong keyboard layout and want to change it, keep in mind
+that your passwords are going to change too.</para>
+        </note>
+      </listitem>
+
+      <listitem>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
+
+        <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add or configure other pointing devices, tablets, trackballs
+etc.</para>
+      </listitem>
+
+      <listitem>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
+
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
+      </listitem>
+
+      <listitem>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
+
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
+
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
+    </itemizedlist>
+
+    <mediaobject>
+<imageobject> <imagedata format="PNG" xml:id="summaryBottom-im1"
+align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></mediaobject>
+  </section>
+
+  <section xml:id="misc-params-network">
+    <info>
+      <title xml:id="misc-params-network-ti4">Network and Internet parameters</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
+
+        <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
+repositories.</para>
+
+        <warning>
+          <para xml:id="misc-params-network-pa3" revision="1">When you add a network card, do not forget to set your firewall to monitor
+that interface as well.</para>
+        </warning>
+      </listitem>
+
+      <listitem>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
+
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
+
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="misc-params-security">
+    <info>
+      <title xml:id="misc-params-security-ti5">Segurança</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
+
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
+      </listitem>
+
+      <listitem>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
+
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
+
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
+
+        <warning>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
+        </warning>
+      </listitem>
+    </itemizedlist>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/reboot.xml b/docs/docs/stable/installer/pt/reboot.xml
new file mode 100644
index 00000000..7ef4bc7d
--- /dev/null
+++ b/docs/docs/stable/installer/pt/reboot.xml
@@ -0,0 +1,25 @@
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="pt" xml:id="reboot">
+  <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
+<info>
+    <title xml:id="reboot-ti1">Reiniciar</title>
+  </info>
+  
+  
+  <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
+  <mediaobject condition="live">
+<imageobject> <imagedata format="PNG" xml:id="reboot-im1"
+fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/resizeFATChoose.xml b/docs/docs/stable/installer/pt/resizeFATChoose.xml
new file mode 100644
index 00000000..05de0589
--- /dev/null
+++ b/docs/docs/stable/installer/pt/resizeFATChoose.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1999/xhtml"
+ xmlns:ns2="http://www.w3.org/1999/xlink"
+ xmlns:ns="http://docbook.org/ns/docbook"
+  version="5.0" xml:lang="pt" xml:id="resizeFATChoose">
+   
+  
+
+    
+
+  <info>
+    <!-- Made by marja on 2012 03 31 -->
+<!--2013-12-01 re-adding this file to software/i18n/tools/docs/installer/en
+  in git, in case the related screen gets restored in drakx-installer-stage2-->
+<title xml:id="resizeFATChoose-ti1">Resize <application>Windows<superscript>®</superscript></application>
+partition</title>
+  </info>
+
+  <para revision="1" xml:id="resizeFATChoose-pa1">You have more than one
+<application>Windows<superscript>®</superscript></application> partition.
+Choose which one should be made smaller to make space for installing
+<application>Mageia</application>.</para>
+
+  
+   
+<!--<para revision="1" xml:id="resizeFATChoose-pa2">
+.......</para>
+
+ <para revision="1" xml:id="resizeFATChoose-pa3">........</para>-->
+</section>
diff --git a/docs/docs/stable/installer/pt/securityLevel.xml b/docs/docs/stable/installer/pt/securityLevel.xml
new file mode 100644
index 00000000..c6bd50c8
--- /dev/null
+++ b/docs/docs/stable/installer/pt/securityLevel.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="securityLevel-ti1">Nível de Segurança</title>
+  </info>
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
+<!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
+
+  <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
+
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
+
+  <para><emphasis role="bold">Security Administrator</emphasis></para>
+
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
+send <emphasis>security alert messages</emphasis> when it detects situations
+which require notification to a system administrator.</para>
+
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
+
+  <note>
+    <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
+messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
+be configured for receiving such mail!</para>
+  </note>
+
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt/selectCountry.xml b/docs/docs/stable/installer/pt/selectCountry.xml
new file mode 100644
index 00000000..f5ab7366
--- /dev/null
+++ b/docs/docs/stable/installer/pt/selectCountry.xml
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="pt">
+  <info>
+    <title xml:id="selectCountry-ti1">Selecione o seu País / Região</title>
+  </info>
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
+<imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
+align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+like the currency and wireless regulatory domain. Setting the wrong country
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
+
+  <note>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
+  </note>
+
+  <section xml:id="inputMethod">
+    <info>
+      <title xml:id="inputMethod-ti7">Método de Inserção:</title>
+    </info>
+
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
+input method (at the bottom of the list). Input methods allow users to input
+multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
+default input method, so users should not need to configure it
+manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
+functions and can be installed if you added HTTP/FTP media before package
+selection.</para>
+
+    <note>
+      <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
+    </note>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/selectInstallClass.xml b/docs/docs/stable/installer/pt/selectInstallClass.xml
new file mode 100644
index 00000000..96e152c6
--- /dev/null
+++ b/docs/docs/stable/installer/pt/selectInstallClass.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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>
+    <!-- Made by marja on 2012 03 18 -->
+<!-- 20120405 updated JohnR -->
+<!-- enhanced xml code for screenshot, removed para xml:id's, changed "you'll" to
+      "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
+<!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
+<!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
+<title xml:id="selectInstallClass-ti1">Instalar ou Atualizar</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para><emphasis role="bold">Install</emphasis></para>
+
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
+    </listitem>
+
+    <listitem>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
+
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
+    </listitem>
+  </itemizedlist>
+
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
+
+  <tip>
+    <para>If you have discovered that you forgot to select an additional language, you
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
+  </tip>
+</section>
diff --git a/docs/docs/stable/installer/pt/selectKeyboard.xml b/docs/docs/stable/installer/pt/selectKeyboard.xml
new file mode 100644
index 00000000..b4abf019
--- /dev/null
+++ b/docs/docs/stable/installer/pt/selectKeyboard.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!-- Started by marja on 2012 03 31 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
+<title xml:id="selectKeyboard-ti1">Teclado</title>
+  </info>
+
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX selects an appropriate keyboard for your language. If no suitable
+keyboard is found it will default to a US keyboard layout.</para>
+
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
+</imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="selectKeyboard-pa2">Make sure that the selection is correct or choose another keyboard
+layout. If you don't know which layout your keyboard has, look in the
+specifications that came with your system, or ask the computer vendor. There
+may even be a label on the keyboard that identifies the layout. You can also
+look here: <link
+xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/Keyboard_layout</link></para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
+extra dialogue screen asking how you would prefer to switch between the
+Latin and non-Latin keyboard layouts</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/pt/selectKeyboardLive.xml b/docs/docs/stable/installer/pt/selectKeyboardLive.xml
new file mode 100644
index 00000000..59d189ac
--- /dev/null
+++ b/docs/docs/stable/installer/pt/selectKeyboardLive.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt/selectLanguage.xml b/docs/docs/stable/installer/pt/selectLanguage.xml
new file mode 100644
index 00000000..64450f09
--- /dev/null
+++ b/docs/docs/stable/installer/pt/selectLanguage.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!-- Made by marja on 2012 04 01, using barjac's text -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- SimonNZG 2012-04-03 has had a look -->
+<!-- removed para id's, corrected duplicate id's for segments, corrected wrong
+       code in figure, marja, 20120409 -->
+<!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
+       up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
+<title xml:id="selectLanguage-ti1">Por favor, escolha o idioma a usar</title>
+  </info>
+
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
+
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
+
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
+
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
+    </listitem>
+
+    <listitem>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
+    </listitem>
+
+    <listitem>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/pt/selectMouse.xml b/docs/docs/stable/installer/pt/selectMouse.xml
new file mode 100644
index 00000000..fe28e035
--- /dev/null
+++ b/docs/docs/stable/installer/pt/selectMouse.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="selectMouse-ti1">Select mouse</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Made by marja on 2012 04 11 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- adding some "real" text now that we know the page shows up in the right place-->
+<!-- marja 2012-04-24 adding screenshot -->
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="selectMouse-pa1">If you are not happy with how your mouse responds, you can select a
+different one here.</para>
+
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
+
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt/setupBootloader.xml b/docs/docs/stable/installer/pt/setupBootloader.xml
new file mode 100644
index 00000000..6c4fe008
--- /dev/null
+++ b/docs/docs/stable/installer/pt/setupBootloader.xml
@@ -0,0 +1,198 @@
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="pt" xml:id="setupBootloader">
+  
+  
+  
+  
+  
+  
+  <info>
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
+Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
+  </info>
+  <section>
+    <title>Grub2</title>
+    <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
+      <listitem>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
+      </listitem>
+      <listitem>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
+      </listitem>
+    </itemizedlist>
+    <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
+      <listitem>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
+      </listitem>
+      <listitem>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
+    <section>
+      <title>Opções principais do carregador de arranque</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+    <section>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
+        </listitem>
+      </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Using an existing bootloader</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Add or Modify a Boot Menu Entry</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
+    </section>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/setupBootloaderAddEntry.xml b/docs/docs/stable/installer/pt/setupBootloaderAddEntry.xml
new file mode 100644
index 00000000..b9487a2d
--- /dev/null
+++ b/docs/docs/stable/installer/pt/setupBootloaderAddEntry.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt" xml:id="setupBootloaderAddEntry">
+  
+
+  <info>
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
+
+Lebarhon 2016 12 16 Updated for Mageia 6-->
+<title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
+  </info>
+
+  <para>To do this you need to manually edit /boot/grub2/custom.cfg or use the
+software <emphasis role="bold">grub-customizer</emphasis> tool instead
+(available in the Mageia repositories).</para>
+
+  <note>
+    <para>For more information, see: <link
+ns2:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/setupSCSI.xml b/docs/docs/stable/installer/pt/setupSCSI.xml
new file mode 100644
index 00000000..e08acb93
--- /dev/null
+++ b/docs/docs/stable/installer/pt/setupSCSI.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="setupSCSI-ti1">Setup SCSI</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Made by marja on 2012 04 02 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- JohnR - edited 2012-03-03 -->
+<!-- SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) -->
+<!-- barjac has re-reviewed and made some minor tweaks. Revisions incremented. -->
+<!-- marja 2012-04-24 added screenshot -->
+<!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
+       Mdv doc instead of on our setupSCSI file -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
+
+  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
+SCSI controllers it may be unable to determine the correct drivers to use
+and subsequently fail to recognise the drive.</para>
+
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt/software.xml b/docs/docs/stable/installer/pt/software.xml
new file mode 100644
index 00000000..b3e3c16d
--- /dev/null
+++ b/docs/docs/stable/installer/pt/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="pt" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt/soundConfig.xml b/docs/docs/stable/installer/pt/soundConfig.xml
new file mode 100644
index 00000000..0fe5a15c
--- /dev/null
+++ b/docs/docs/stable/installer/pt/soundConfig.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="soundConfig-ti1">Configuração do Som</title>
+  </info>
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
+
+  <section xml:id="soundConfig-Advanced">
+    <info>
+      <title xml:id="soundConfig-Advanced-ti1">Avançado</title>
+    </info>
+
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/pt/takeOverHdConfirm.xml b/docs/docs/stable/installer/pt/takeOverHdConfirm.xml
new file mode 100644
index 00000000..44216c99
--- /dev/null
+++ b/docs/docs/stable/installer/pt/takeOverHdConfirm.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="takeOverHdConfirm-ti1">Confirm hard disk to be formatted</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Made by marja on 2012 04 03 -->
+<!-- test comment - johnr -->
+<!-- 2012-04-24 marja - replaced "if you are not sure you selected the correct
+    hard disk." with "if you are not sure about your choice", because I'm sure I
+    saw this help screen when I had only one HD -->
+<!-- 2013-05-05 marja added screenshot -->
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
+choice.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/pt/testing.xml b/docs/docs/stable/installer/pt/testing.xml
new file mode 100644
index 00000000..e79736d7
--- /dev/null
+++ b/docs/docs/stable/installer/pt/testing.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="testing" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testing Mageia as Live system</title>
+  </info>
+
+  <section xml:id="testing-1">
+    <info>
+      <title xml:id="testing1-ti1">Live mode</title>
+    </info>
+
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
+    <mediaobject>
+<imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
+
+    <section>
+      <info>
+        <title xml:id="testing2-ti1">Testing hardware</title>
+      </info>
+
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>network interface: configure it with net_applet</para>
+        </listitem>
+
+        <listitem>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
+        </listitem>
+
+        <listitem>
+          <para>sound: a jingle has already been played</para>
+        </listitem>
+
+        <listitem>
+          <para>printer: configure your printer/s and print a test page</para>
+        </listitem>
+
+        <listitem>
+          <para>scanner: scan a document from ...</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
+
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
+    </section>
+
+    <section>
+      <info>
+        <title xml:id="testing3-ti1">Launch installation</title>
+      </info>
+
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="live-liveMode-install.png"/>
+</imageobject></mediaobject>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/pt/uninstall-Mageia.xml b/docs/docs/stable/installer/pt/uninstall-Mageia.xml
new file mode 100644
index 00000000..4cd56ba7
--- /dev/null
+++ b/docs/docs/stable/installer/pt/uninstall-Mageia.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <!--Lebarhon 2015-07-06 Not true with UEFI 
+Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
+<info>
+    <title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
+  </info>
+
+  
+
+  
+
+  <para>If Mageia didn't convince you or you can't install it correctly - in short
+you want get rid of it - that is your right and Mageia also gives you the
+possibility to uninstall. This is not true for every operating system.</para>
+
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
+
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
+
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
+
+  <para>If you have Vista or 7, you have one more possibility, you can extend the
+existing partition that is at the left of the freed space. There are other
+partitioning tools that can be used, such as <emphasis
+role="bold">gparted</emphasis>, available for both Windows and Linux. As
+always, when changing partitions, be very careful to back up anything
+important to you.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt/unused.xml b/docs/docs/stable/installer/pt/unused.xml
new file mode 100644
index 00000000..ecf51428
--- /dev/null
+++ b/docs/docs/stable/installer/pt/unused.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="pt">
+  <info>
+    <title xml:id="unused-ti1">Keep or delete unused material</title>
+  </info>
+
+  
+
+  <mediaobject condition="live">
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
+
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
+
+  <mediaobject>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
+</imageobject></mediaobject>
+
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/DrakLive-cover.xml b/docs/docs/stable/installer/pt_BR/DrakLive-cover.xml
index 83f6c6c6..45f5e384 100644
--- a/docs/docs/stable/installer/pt_BR/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/pt_BR/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="pt_BR" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="pt_BR" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Instalação do LIVE CD</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Janeiro 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Instalação do LIVE CD</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">A documentação oficial para Mageia</para>
+      <para role="tagline">A documentação oficial para Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Os textos e imagens deste manual estão disponíveis sob a licença CC BY-SA
+
+      <para>Os textos e imagens deste manual estão disponíveis sob a licença CC BY-SA
 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-            </para>
-            <para>Este manual foi produzido com a ajuda de <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Este manual foi produzido com a ajuda de <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> desenvolvido por <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-            </para>
-            <para>Ele foi escrito por voluntários em seu tempo livre. Entre em contato com a
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Ele foi escrito por voluntários em seu tempo livre. Entre em contato com a
 <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipe de
-Documentação</link>, se você deseja ajudar a melhorar este manual.</para> 
+Documentação</link>, se você deseja ajudar a melhorar este manual.</para>
     </cover>
   </info>
+
   <article>
     <title>Instalação do LIVE CD</title>
-       <para><note>
-          <para>Ninguém vai ver todas as telas do instalador mostradas neste manual. As
+
+    <para><note>
+        <para>Ninguém vai ver todas as telas do instalador mostradas neste manual. As
 telas que você verá dependem de seu hardware e as escolhas que você faz
 durante a instalação.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/pt_BR/DrakLive.xml b/docs/docs/stable/installer/pt_BR/DrakLive.xml
index 31afc404..c40e38a3 100644
--- a/docs/docs/stable/installer/pt_BR/DrakLive.xml
+++ b/docs/docs/stable/installer/pt_BR/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="pt_BR" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="pt_BR" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Instalação do LIVE CD</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Instalação do LIVE CD</title>
 
     <cover>
       <para><note>
@@ -17,9 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> desenvolvido por <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>Ele foi escrito por voluntários em seu tempo livre. Entre em contato com a
-<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipe de
-Documentação</link>, se você deseja ajudar a melhorar este 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>
 
@@ -39,7 +54,12 @@ Documentação</link>, se você deseja ajudar a melhorar este manual.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +69,18 @@ Documentação</link>, se você deseja ajudar a melhorar este manual.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/pt_BR/DrakX-cover.xml b/docs/docs/stable/installer/pt_BR/DrakX-cover.xml
index 3d672aeb..e3ae98ee 100644
--- a/docs/docs/stable/installer/pt_BR/DrakX-cover.xml
+++ b/docs/docs/stable/installer/pt_BR/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="pt_BR" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="pt_BR" xml:id="Quick-Startup"
+      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>Instalando com DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Fevereiro 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Fevereiro 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">A documentação oficial para Mageia</para>
+      <para role="tagline">A documentação oficial para Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>Os textos e imagens deste manual estão disponíveis sob a licença CC BY-SA
+
+      <para>Os textos e imagens deste manual estão disponíveis sob a licença CC BY-SA
 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Este manual foi produzido com a ajuda de <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Este manual foi produzido com a ajuda de <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> desenvolvido por <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>Ele foi escrito por voluntários em seu tempo livre. Entre em contato com a
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Ele foi escrito por voluntários em seu tempo livre. Entre em contato com a
 <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipe de
-Documentação</link>, se você deseja ajudar a melhorar este manual.</para> 
+Documentação</link>, se você deseja ajudar a melhorar este manual.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Instalando com DrakX</title>
-       <para><note>
-          <para>Ninguém vai ver todas as telas do instalador mostradas neste manual. As
+
+    <para><note>
+        <para>Ninguém vai ver todas as telas do instalador mostradas neste manual. As
 telas que você verá dependem de seu hardware e as escolhas que você faz
 durante a instalação.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ durante a instalação.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/pt_BR/DrakX-inline.xml b/docs/docs/stable/installer/pt_BR/DrakX-inline.xml
new file mode 100644
index 00000000..11723577
--- /dev/null
+++ b/docs/docs/stable/installer/pt_BR/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="pt_BR" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Instalando com DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>Ninguém vai ver todas as telas do instalador mostradas neste manual. As
+telas que você verá dependem de seu hardware e as escolhas que você faz
+durante a instalação.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Os textos e imagens deste manual estão disponíveis sob a licença CC BY-SA
+3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Este manual foi produzido com a ajuda de <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> desenvolvido por <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Ele foi escrito por voluntários em seu tempo livre. Entre em contato com a
+<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipe de
+Documentação</link>, se você deseja ajudar a melhorar este manual.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/DrakX.xml b/docs/docs/stable/installer/pt_BR/DrakX.xml
index 3e69e317..d845c2f7 100644
--- a/docs/docs/stable/installer/pt_BR/DrakX.xml
+++ b/docs/docs/stable/installer/pt_BR/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="pt_BR" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="pt_BR" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Instalando com DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Instalando com DrakX</title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ Documentação</link>, se você deseja ajudar a melhorar este manual.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ Documentação</link>, se você deseja ajudar a melhorar este manual.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ Documentação</link>, se você deseja ajudar a melhorar este manual.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ Documentação</link>, se você deseja ajudar a melhorar este manual.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ Documentação</link>, se você deseja ajudar a melhorar este manual.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ Documentação</link>, se você deseja ajudar a melhorar este manual.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/pt_BR/SelectAndUseISOs2.xml b/docs/docs/stable/installer/pt_BR/SelectAndUseISOs2.xml
index 0b27e7b3..b32447fb 100644
--- a/docs/docs/stable/installer/pt_BR/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/pt_BR/SelectAndUseISOs2.xml
@@ -1,38 +1,74 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="pt_BR" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Selecionar e usar ISOs</title>
   </info>
   <section>
     <title>Introdução</title>
     <para>Mageia é distribuído através de imagens ISO. Esta página ajudará você a
 escolher qual imagem melhor atende às suas necessidades.</para>
-    <para>Existem duas famílias de mídia:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Instalador Clássico: A inicialização com esta mídia fornece a máxima
-flexibilidade para escolher o que instalar e como configurar seu sistema. Em
-particular, você tem a escolha de qual ambiente de "Desktop" instalar</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>Mídia LIVE: Esta opção permite que você experimente a Mageia sem precisar
-instalá-la ou fazer alterações no seu computador. Se a instalação for
-decidida, o processo é mais simples, mas você terá menos opções do que as
-oferecidas pelo instalador Clássico</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>Essas mídias são muito leves (menos de 100 MB) e são convenientes se a
+largura de banda for pequena para baixar um DVD completo, ou se você tiver
+um PC sem uma unidade de DVD ou não puder inicializar a partir de um
+dispositivo USB.</para>
       </listitem>
     </itemizedlist>
-    <para>Detalhes são fornecidos nas próximas seções.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Mídia</title>
     <section>
       <title>Definição</title>
-      <para>Aqui, um medium (plural: media em Latim) é um arquivo de imagem ISO que
-permite instalar e/ou atualizar o Mageia e, por extensão, qualquer suporte
-físico (DVD, pendrive, ...) para o qual o arquivo ISO é copiado.</para>
+      <para>Here, a medium (plural: media) is an ISO image file that allows you to
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>Você pode encontrar a ISO Mageia <link
 ns4:href="http://www.mageia.org/en/downloads/">aqui</link>.</para>
     </section>
@@ -42,25 +78,25 @@ ns4:href="http://www.mageia.org/en/downloads/">aqui</link>.</para>
         <title>Características comuns</title>
         <itemizedlist>
           <listitem>
-            <para>Essas ISOs usam o instalador Clássico chamado drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
-            <para>Eles são usados para executar instalações limpas ou para atualizar uma
-versão instalada anteriormente da Mageia.</para>
+            <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Mídia diferente para arquiteturas de 32 e 64 bits.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Algumas ferramentas estão disponíveis na tela de boas-vindas: Resgatar
-Sistema, teste de memória, hardware ferramenta de detecção.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Cada DVD contém muitos ambientes de trabalho disponíveis e idiomas.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Você vai ser dada a opção durante a instalação para adicionar software non
-free.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -71,21 +107,20 @@ free.</para>
         <title>Características comuns</title>
         <itemizedlist>
           <listitem>
-            <para>Pode ser usado para visualizar o sistema operacional Mageia sem ter que
-instalá-lo. Também pode ser usado para instalar o Mageia, se desejar.</para>
+            <para>Can be used to preview the Mageia operating system without having to install
+it</para>
           </listitem>
           <listitem>
-            <para>Cada ISO contém apenas um ambiente de trabalho (Plasma, GNOME ou Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Mídia diferente para arquiteturas de 32 e 64 bits.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para>Os ISOs ativos só podem ser usados para criar instalações limpas, eles não
-podem ser usados para atualizar versões Mageia instaladas anteriormente.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Contêm software não livre.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -93,13 +128,13 @@ podem ser usados para atualizar versões Mageia instaladas anteriormente.</para>
         <title>Live DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Ambiente de trabalho de plasma apenas.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Todos os idiomas disponíveis estão presentes.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Arquitetura de 64 bits somente.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -107,13 +142,13 @@ podem ser usados para atualizar versões Mageia instaladas anteriormente.</para>
         <title>Live DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>Ambiente Desktop GNOME somente.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Todos os idiomas disponíveis estão presentes.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Arquitetura de 64 bits somente</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -121,13 +156,13 @@ podem ser usados para atualizar versões Mageia instaladas anteriormente.</para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Xfce apenas ambiente de trabalho.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Todos os idiomas disponíveis estão presentes.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Arquitetura de 32 ou 64 bit.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -138,23 +173,10 @@ podem ser usados para atualizar versões Mageia instaladas anteriormente.</para>
         <title>Características comuns</title>
         <itemizedlist>
           <listitem>
-            <para>São ISOs mínimos que não contêm mais do que o necessário para iniciar o
-instalador do "drakx" e encontrar o "drakx-installer-stage2" e outros
-pacotes necessários para continuar e concluir a instalação. Esses pacotes
-podem estar no disco rígido do PC, em uma unidade local, em uma rede local
-ou na Internet.</para>
-          </listitem>
-          <listitem>
-            <para>Essas mídias são muito leves (menos de 100 MB) e são convenientes se a
-largura de banda for pequena para baixar um DVD completo, ou se você tiver
-um PC sem uma unidade de DVD ou não puder inicializar a partir de um
-dispositivo USB.</para>
-          </listitem>
-          <listitem>
-            <para>Mídia diferente para arquiteturas de 32 e 64 bits.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Os primeiros passos são apenas em inglês.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -162,8 +184,8 @@ dispositivo USB.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contém apenas software livre, para aquelas pessoas que preferem não usar
-software não-livre.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -171,8 +193,7 @@ software não-livre.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contém software não-livre (na maior parte drivers, codecs...) para quem
-precisa.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -182,73 +203,89 @@ precisa.</para>
     <title>Baixando e checando Mídia</title>
     <section>
       <title>Baixando</title>
-      <para>Depois de ter escolhido o seu arquivo ISO, você pode baixá-lo usando "http"
-ou "BitTorrent". Em ambos os casos, você recebe algumas informações, como o
-espelho em uso e uma opção para alternar se a largura de banda for
-insuficiente. Se "http" for escolhido, você também verá algo sobre as somas
-de verificação.</para>
+      <para>Once you have chosen your ISO file, you can download it using either http or
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>"md5sum" e "sha1sum" são ferramentas para verificar a integridade do arquivo
-ISO. Escolha um ou outro e copie a soma de verificação <link
-linkend="integrity">para uso posterior</link>. Então uma janela similar a
-esta aparece:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Selecione a opção "Salvar Arquivo" e clique em OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Verificar a integridade da mídia baixada</title>
-      <para>As somas de verificação mencionadas anteriormente são impressões digitais,
-geradas por um algoritmo, do arquivo a ser baixado. Você pode comparar a
-soma de verificação do seu ISO baixado com o da ISO do arquivo fonte
-original. Se as somas de verificação não corresponderem, isso significa que
-os dados reais nos ISOs não coincidem e, se for o caso, você deve fazer
-novamente o "download" ou tentar um reparo usando o BitTorrent.</para>
+      <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>Para gerar a soma de verificação para o seu arquivo ISO baixado, abra um
 terminal (não é necessário ser "root") e:</para>
       <itemizedlist>
         <listitem>
-          <para>Para usar o "md5sum", na linha de comando do terminal, digite:
-<userinput>md5sum caminho/para/o arquivo.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+        <listitem>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
         </listitem>
+
         <listitem>
-          <para>Para usar "sha1sum", na linha de comando do terminal, digite:
-<userinput>sha1sum camonho/para/o/arquivo.iso</userinput></para>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Exemplo:</para>
+      <para>Exemplo:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>e compare o resultado (você pode ter que esperar um pouco) com a soma de
-verificação fornecida pela Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Queimar ou despejar a ISO</title>
-    <para>O ISO verificado agora pode ser gravado em um CD / DVD ou jogado em um
-pendrive. Esta não é uma operação de cópia padrão, pois uma mídia
-inicializável será realmente criada.</para>
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
     <section>
       <title>Gravando a ISO para o CD/DVD</title>
-      <para>Qualquer que seja o software que você usa, certifique-se que a opção para
-gravar <emphasis role="bold">imagem</emphasis> seja usada, e se os <emphasis
-role="bold">dados</emphasis> ou <emphasis role="bold">arquivos</emphasis> de
-gravação não estão corretos. Veja o <link
-ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">wiki da
-Mageia</link> para mais informações.</para>
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
+ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
+wiki</link> for more information.</para>
     </section>
     <section>
       <title>Despejar a ISO para um pendrive USB</title>
-      <para>Todas as ISOs Mageia são híbridos, o que significa que você pode 'despejar'
-los para um stick USB e usá-lo para inicializar e instalar o sistema.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Descarga" uma imagem em um dispositivo flash destrói qualquer sistema de
-arquivos anterior no dispositivo; quaisquer dados existentes serão perdidos
-e a capacidade da partição será reduzida ao tamanho da imagem.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>Para recuperar a capacidade original, você deve refazer partição e
-reformatar o dispositivo USB.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Usando uma ferramenta gráfica do Mageia</title>
         <para>Você pode usar uma ferramenta gráfica como <link
@@ -259,8 +296,8 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <para>Você poderia tentar:</para>
         <itemizedlist>
           <listitem>
-            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> usando a
-opção "imagem ISO".</para>
+            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32  Disk
@@ -269,7 +306,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Usando linha de comando dentro de um sistema GNU/Linux</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>É potencialmente "perigoso" fazer isso manualmente. Você corre o risco de
 substituir dados existentes, possivelmente valiosos, se você especificar o
@@ -280,29 +317,28 @@ dispositivo de destino errado.</para>
             <para>Abra um console</para>
           </listitem>
           <listitem>
-            <para>Torne-se um usuário "root" (Administrador) com o comando <userinput>su
--</userinput> (não esqueça o final '-')</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Conecte seu cartão USB (não montá-lo, isso também significa não abrir
-qualquer aplicativo ou gerenciador de arquivos que podem acessar ou lê-lo)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Digite o comando <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Encontre o "nome de dispositivo" para o seu "stik" USB (por seu tamanho),
-por exemplo, <code>/dev/sdb</code> que, na imagem acima, é um "stick" USB de
-8GB.</para>
-            <para>Alternativamente, você pode encontrar o "nome de dispositivo" com o comando
-<code>dmesg</code>. No final deste exemplo, você pode ver o "nome de
-dispositivo" começando com <emphasis>sd</emphasis>. Nesse caso,
-<emphasis>sdd</emphasis> é o dispositivo real. Você também pode ver que seu
-tamanho é de 2 GB:</para>
+            <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+            <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
@@ -323,22 +359,22 @@ tamanho é de 2 GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Digite o comando: <emphasis role="bold"># <userinput>dd
-if=caminho/para/arquivo/ISO of=/dev/sdX bs = 1M</userinput></emphasis></para>
-            <para>Onde X=seu "nome de dispositvo". Ex.: /dev/sdd</para>
-            <para>Examplo:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>Pode ser útil saber que <emphasis role="bold">if</emphasis> significa
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-(arquivo de entrada) e que <emphasis role="bold">of</emphasis> significa
-<emphasis role="bold">o</emphasis>utput <emphasis
-role="bold">f</emphasis>ile (arquivo de saída)</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Digite o comando: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>Este é o fim do processo, e agora você pode desconectar seu pendrive.</para>
@@ -347,4 +383,4 @@ role="bold">f</emphasis>ile (arquivo de saída)</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/acceptLicense.xml b/docs/docs/stable/installer/pt_BR/acceptLicense.xml
index aaf76741..6831e91d 100644
--- a/docs/docs/stable/installer/pt_BR/acceptLicense.xml
+++ b/docs/docs/stable/installer/pt_BR/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Licenças e Notas de Lançamento</title>
   </info>
 
@@ -46,18 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">Acordo de Licença</title>
     </info>
 
-    <para>Antes de instalar  <application>Mageia</application>, por favor, leia os
-termos e condições da licença cuidadosamente.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Estes termos e condições aplicam-se à distribuição
-<application>Mageia</application> toda e deve ser aceita antes para que você
-possa continuar.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Para continuar, basta selecionar <guilabel>Aceitar</guilabel> e depois
-clicar em <guibutton>Próximo</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Se você decidir não aceitar essas condições, então agradecemos a
-procura. Clicando <guibutton>Sair</guibutton> irá reiniciar seu computador.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -75,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Informações importantes sobre esta versão do
-<application>Mageia</application> podem ser visualizadas clicando no botão
-<guibutton>Notas de Lançamento</guibutton>.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/addUser.xml b/docs/docs/stable/installer/pt_BR/addUser.xml
index 7e04bb35..ded409d8 100644
--- a/docs/docs/stable/installer/pt_BR/addUser.xml
+++ b/docs/docs/stable/installer/pt_BR/addUser.xml
@@ -1,35 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt_BR" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Gerenciador de Usuário e Superusuário</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Definir senha do administrador (root):</title>
     </info>
 
-    <para>É aconselhável que todas as instalações do <application>Mageia</application>
-definam uma senha <emphasis role="bold"> superuser</emphasis>
-(administrador), normalmente chamada <emphasis>senha root</emphasis> no
-Linux. À medida que você digita uma senha na caixa superior, um escudo muda
-de vermelho para amarelo para verde, dependendo da força da senha. Um escudo
-verde mostra que você está usando uma senha forte. Você precisa repetir a
-mesma senha na caixa abaixo, para verificar se a primeira entrada não foi
-digitada incorretamente.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>Todas as senhas diferenciam maiúsculas de minúsculas. É melhor usar uma
-mistura de letras (maiúsculas e minúsculas), números e outros caracteres em
-uma senha.</para>
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
 
@@ -38,44 +55,46 @@ uma senha.</para>
       <title xml:id="enterUser-ti3">Digite um usuário</title>
     </info>
 
-    <para>Adicione um usuário aqui. Um usuário comum tem menos privilégios do que o
-<emphasis role="bold">superusuário</emphasis> (root), mas o suficiente para
-usar a Internet, aplicativos de escritório ou jogos e qualquer outra coisa
-que o usuário comum possa usar.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Ícone</guibutton>: se você clicar neste botão, ele irá mudar o
-ícone do usuário.</para>
+        <para><emphasis role="bold">Icon</emphasis></para>
+
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Nome Real</guilabel>: Insira o nome real do usuário nesta caixa de
-texto.</para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Nome de Login</guilabel>: Digite o nome de login do usuário ou
-deixe que o DrakX use uma versão do nome real do usuário. <emphasis
-role="bold">O nome de login faz distinção entre maiúsculas e
-minúsculas.</emphasis></para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Senha</guilabel>: Digite a senha do usuário. Há um escudo no final
-da caixa de texto que indica a força da senha. (Veja também <xref
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
 linkend="givePassword"/>)</para>
-      </listitem>
 
-      <listitem>
-        <para><guilabel>Senha (novamente)</guilabel>: Redigite a senha do usuário O DrakX
-verificará se você não digitou a senha incorretamente.</para>
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Todos os usuários que você adicionou ao instalar o Mageia terão um diretório
-inicial que seja lido e protegido por gravação (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>Você pode adicionar qualquer usuário extra necessário na etapa
 <emphasis>Configuração - Resumo</emphasis> durante a instalação. Escolha
@@ -85,34 +104,31 @@ inicial que seja lido e protegido por gravação (umask=0027).</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Gerenciamento Avançado de Usuários</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>A opção <guibutton>Avançado</guibutton> permite que você edite configurações
-adicionais para o usuário que você está adicionando.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: Esta lista suspensa permite que você altere o
-shell disponível para qualquer usuário que você tenha adicionado na tela
-anterior. As opções são <emphasis role="bold">Bash</emphasis>, <emphasis
-role="negrito">Dash</emphasis> e <emphasis role="bold">Sh</emphasis></para>
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>ID do usuario</guilabel>: Aqui pode definir o <emphasis
-role="bold">ID de usuario</emphasis> para qualquer utilizador que tenha
-adicionado no ecrã anterior. Se você não souber qual é o objetivo disso,
-deixe em branco.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>ID do Grupo</guilabel>: Isto permite-lhe definir o <emphasis
-role="bold">ID do grupo</emphasis>. Novamente, se não tiver certeza, deixe
-em branco.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/add_supplemental_media.xml b/docs/docs/stable/installer/pt_BR/add_supplemental_media.xml
index 38ec287d..3dbaaf79 100644
--- a/docs/docs/stable/installer/pt_BR/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/pt_BR/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="pt_BR">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Seleção de Mídia (Configurar a Instalação de Mídias Suplementares )</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,43 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>Esta tela mostra a lista de repositórios já reconhecidos. Você pode
-adicionar outras fontes para pacotes, como um disco ótico ou uma fonte
-remota. A seleção de origem determina quais pacotes estarão disponíveis
-durante as próximas etapas.</para>
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Para instalação via rede, siga os seguintes passos:</para>
 
   <orderedlist>
     <listitem>
-      <para>Escolha e ativação da rede, caso não esteja disponível.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
-      <para>Selecionando um espelho ou especificando um URL (primeira entrada). Ao
-selecionar um espelho, você tem acesso à seleção de todos os repositórios
-gerenciados pela Mageia, como os <emphasis role="bold">Nonfree</emphasis>,
-os repositórios <emphasis role="bold">Tainted</emphasis> e o <emphasis
-role="bold">Atualizações</emphasis>. Com o URL, você pode designar um
-repositório específico ou sua própria instalação do NFS.</para>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>Se você estiver atualizando uma instalação de 64 bits que pode conter alguns
-pacotes de 32 bits, é recomendável usar essa tela para adicionar um espelho
-on-line, marcando um dos protocolos de rede aqui. O ISO de DVD de 64 bits
-contém apenas pacotes de 64 bits e noarch, não será possível atualizar os
-pacotes de 32 bits. No entanto, após adicionar um espelho online, o
-instalador encontrará os pacotes de 32 bits necessários.</para>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/ask_mntpoint_s.xml b/docs/docs/stable/installer/pt_BR/ask_mntpoint_s.xml
index 0e7388af..fa645e11 100644
--- a/docs/docs/stable/installer/pt_BR/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/pt_BR/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="pt_BR">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Escolha os pontos de montagem</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,44 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Aqui você vê as partições Linux que foram encontrados em seu computador. Se
-você não concorda com as sugestões do <application>DrakX</application>, você
-pode alterar os pontos de montagem.</para>
-
-  <note>
-    <para>Se você mudar alguma coisa, certifique-se de que ainda tem uma partição
-<emphasis role="bold"><literal>/</literal></emphasis> (root).</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Cada partição é mostrada à esquerda como: <emphasis role="bold">Dispositivo
-(capacidade, ponto de montagem, tipo).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Dispositivo</emphasis>, é feito de: <emphasis
-role="bold">disco rígido</emphasis>, [<emphasis role="bold">nome do disco
-rígido</emphasis> (carta)], <emphasis role="bold">número de
-partição</emphasis> (por exemplo,<emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>Se você tiver várias partições, poderá escolher vários pontos de montagem
-diferentes no menu suspenso, como <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> e <emphasis
-role="bold">/var</emphasis>. Você pode até mesmo fazer seus próprios pontos
-de montagem, por exemplo <emphasis
-role="bold"><literal>/video</literal></emphasis> para uma partição onde você
-quer armazenar seus filmes, ou <emphasis role="bold">/Data</emphasis> (ou
-algum outro nome) para seus dados.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -80,13 +82,17 @@ de ponto de montagem em branco.</para>
   </itemizedlist>
 
   <warning>
-    <para>Se não tiver a certeza do que escolher, clique em <emphasis
-role="bold">anterior</emphasis> para voltar e depois assinale
-<guilabel>Partilha de discos personalizada</guilabel>, onde pode clicar numa
-partição para ver seu tipo e tamanho.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Se você tiver certeza que os pontos de montagem estão corretos, clique em
-<guibutton>Próximo</guibutton> e escolha se você só quiser formatar a(s)
-partição(s) que o DrakX sugere, ou mais.</para>
-</section>
\ No newline at end of file
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/bestTime.xml b/docs/docs/stable/installer/pt_BR/bestTime.xml
index 649ec670..fa105d10 100644
--- a/docs/docs/stable/installer/pt_BR/bestTime.xml
+++ b/docs/docs/stable/installer/pt_BR/bestTime.xml
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pt_BR" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="pt_BR" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Configurações do relógio</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>Nesta etapa, você tem que escolher em que momento o seu relógio interno está
-definido, a hora local ou UTC.</para>
-
-  <para>Na opção Avançado, você vai encontrar mais opções sobre definições do
-relógio.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/bootLive.xml b/docs/docs/stable/installer/pt_BR/bootLive.xml
index eb44da8e..0949fc3e 100644
--- a/docs/docs/stable/installer/pt_BR/bootLive.xml
+++ b/docs/docs/stable/installer/pt_BR/bootLive.xml
@@ -1,32 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="pt_BR"><info><title xml:id="bootLive-ti1">Boot para  Mageia com sistema Live</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Inicializando o ambiente</title></info><section><info><title xml:id="bootLive11-ti1">A partir de um disco</title></info><para>Você pode iniciar diretamente a partir da mídia que usou para queimar sua
-imagem (CD-ROM, DVD-ROM ...). Você normalmente só precisa inseri-lo na
-unidade de CD/DVD para o bootloader para iniciar a instalação
-automaticamente após a reinicialização do computador. Se isso não acontecer
-pode ser necessário reconfigurar o sua BIOS ou pressionar uma chave que irá
-oferecer-lhe para escolher o periférico a partir do qual o computador irá
-arrancar.</para><para>De acordo com o hardware que você tem, e como ele está configurado, você
-verá uma das duas telas abaixo.</para></section><section><info><title xml:id="bootLive12-ti1">A partir de um dispositivo USB</title></info><para>Você pode iniciar a partir do dispositivo USB no qual você colocou sua
-imagem ISO. De acordo com as definições da BIOS, o computador provavelmente
-inicializará diretamente pelo dispositivo USB já conectado em uma porta. Se
-isso não acontecer pode ser necessário reconfigurar a sua BIOS ou pressionar
-uma tecla que irá oferecer-lhe opções para escolher o dispositivo a partir
-do qual o computador irá iniciar.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">No modo BIOS/CSM/Legacy</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Primeira tela durante a inicialização no modo BIOS</para></caption></mediaobject><para>No menu central, você tem a escolha entre três ações:</para><itemizedlist><listitem><para>Inicialização Mageia: Isso significa que Mageia 5 vai começar a partir da
-mídia conectada (CD/ DVD ou dispositivo USB) sem gravar nada no disco, por
-isso esperamos um sistema muito lento. Uma vez que a inicialização for
-feita, você pode ir para a instalação em um disco rígido.</para></listitem><listitem><para>Instalar Mageia: Esta opção irá instalar Mageia diretamente  em um disco
-rígido.</para></listitem><listitem><para>Inicialização do disco rígido: Esta opção permite inicializar a partir de
-disco rígido, como de costume, quando não há mídia (CD/DVD ou dispositivo
-USB) ligado. (Não funciona com Mageia 5).</para></listitem></itemizedlist><para>No menu inferior estão as opções de inicialização:</para><itemizedlist><listitem><para>F1 - Ajuda. Explicar as opções "splash", "APM", "ACPI" e "Ide"</para></listitem><listitem><para>F2 - Linguagem. Escolha o idioma das telas de exibição.</para></listitem><listitem><para>F3 - Resolução da tela. Escolha entre texto, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-ROM ou outro. Normalmente, a instalação é executada a partir
-da mídia de instalação inserida. Aqui, selecione outras fontes, como
-servidores FTP ou NFS. Se a instalação for realizada em uma rede com um
-servidor SLP, selecione uma das fontes de instalação disponíveis no servidor
-com esta opção.</para></listitem><listitem><para>F5 - Driver. Sim ou Não. O sistema tem conhecimento sobre a presença de um
-disco óptico com uma atualização do driver e irá requerer a sua inserção
-durante o processo de instalação.</para></listitem><listitem><para>F6 - opções de kernel. Esta é uma maneira para especificar as opções de
-acordo com o seu hardware e os drivers para usar.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">No modo UEFI</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Primeira tela durante a inicialização do sistema UEFI a partir do disco</para></caption></mediaobject><para>Você só tem a opção de executar Mageia no modo Live (primeira escolha) ou
-para processar a instalação (segunda opção).</para><para>Se você inicializou a partir de um pen drive USB, você tem duas linhas
-complementares que são uma cópia das linhas anteriores seguido de
-"USB". Você tem que escolhê-los.</para><para>Em cada caso, os primeiros passos serão os mesmos para escolher o idioma,
-fuso horário e teclado, em seguida, os processos diferem, com <link
-linkend="testing"> passos adicionais no modo Live </link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Boot para  Mageia com sistema Live</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Inicializando o ambiente</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">No modo BIOS/CSM/Legacy</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Primeira tela durante a inicialização no modo BIOS</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">No modo UEFI</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/chooseDesktop.xml b/docs/docs/stable/installer/pt_BR/chooseDesktop.xml
index bd09bb29..1582d61b 100644
--- a/docs/docs/stable/installer/pt_BR/chooseDesktop.xml
+++ b/docs/docs/stable/installer/pt_BR/chooseDesktop.xml
@@ -1,29 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt_BR" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Seleção de Área de Trabalho</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Seleção de Área de Trabalho</title>
   </info>
 
   
 
-  <para>Dependendo da sua seleção aqui, você poderá receber mais telas para ajustar
-sua escolha.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>Após a(s) etapa(s) de seleção, você verá uma apresentação de slides durante
-a instalação do pacote. A apresentação de slides pode ser desativada
-pressionando o botão <guilabel>Detalhes</guilabel></para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Escolha se você prefere usar o ambiente de área de trabalho do
-<application>KDE</application> <emphasis role="bold">Plasma</emphasis> ou
-<application>GNOME</application>. Ambos vêm com um conjunto completo de
-aplicativos e ferramentas úteis. Marque <guilabel>Personalizar</guilabel> se
-não quiser usar nenhum deles (ou mesmo usar ambos) ou se quiser modificar as
-opções de software padrão para esses ambientes de área de trabalho. A área
-de trabalho <application>LXDE</application>, por exemplo, é mais leve que as
-duas anteriores, ostentando menos colírio e menos pacotes instalados por
-padrão.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/choosePackageGroups.xml b/docs/docs/stable/installer/pt_BR/choosePackageGroups.xml
index 81e85dbc..6d7c2c5b 100644
--- a/docs/docs/stable/installer/pt_BR/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/pt_BR/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt_BR" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt_BR" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Seleção de Grupo de Pacotes</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/pt_BR/choosePackagesTree.xml b/docs/docs/stable/installer/pt_BR/choosePackagesTree.xml
index c633846f..cfe8fa23 100644
--- a/docs/docs/stable/installer/pt_BR/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/pt_BR/choosePackagesTree.xml
@@ -1,21 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="pt_BR">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="pt_BR">
   <info>
     <title xml:id="choosePackagesTree-ti1">Escolha Pacotes Individuais</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Aqui você pode adicionar ou remover qualquer pacote extra para personalizar
 sua instalação.</para>
 
-  <para>Depois de ter feito a sua escolha, você pode clicar no ícone do
-<guibutton>disquete</guibutton>, na parte inferior da página, para salvar a
-sua escolha de pacotes (salvar em um pendrive USB, também). Você pode então
-usar este arquivo para instalar os mesmos pacotes em outro sistema,
-pressionando o mesmo botão durante a instalação e escolhendo a carregá-lo.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/configureServices.xml b/docs/docs/stable/installer/pt_BR/configureServices.xml
index 9b5404b7..ee07c0c9 100644
--- a/docs/docs/stable/installer/pt_BR/configureServices.xml
+++ b/docs/docs/stable/installer/pt_BR/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt_BR" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="pt_BR" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Configurar os seus serviços</title>
   </info>
@@ -7,22 +7,32 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Aqui você pode escolher quais serviços devem iniciar ao inicializar seu
 sistema.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Clique em um triângulo para expandir um grupo para todos os serviços
-relevantes.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">As configurações que o DrakX escolheu costumam ser boas.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">Se você selecionar um serviço, algumas informações sobre ele são mostradas
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Se você selecionar um serviço, algumas informações sobre ele são mostradas
 na caixa de informações abaixo.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Apenas mude as coisas quando você sabe muito bem o que você está fazendo.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/configureTimezoneUTC.xml b/docs/docs/stable/installer/pt_BR/configureTimezoneUTC.xml
index 7048d38d..aa4fed3b 100644
--- a/docs/docs/stable/installer/pt_BR/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/pt_BR/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="pt_BR">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="pt_BR">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Configure o seu fuso horário</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Escolha seu fuso horário escolhendo seu país ou uma cidade próxima a você no
-mesmo fuso horário.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">Na próxima tela, você pode optar por definir o relógio do seu hardware para
 a hora local ou para o GMT, também conhecido como UTC.</para>
diff --git a/docs/docs/stable/installer/pt_BR/configureX_card_list.xml b/docs/docs/stable/installer/pt_BR/configureX_card_list.xml
index 477275d0..a3b7b6c2 100644
--- a/docs/docs/stable/installer/pt_BR/configureX_card_list.xml
+++ b/docs/docs/stable/installer/pt_BR/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="pt_BR">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Escolha um Servidor X (Configure sua Placa de Vídeo)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX tem um banco de dados muito completo de placas de vídeo e geralmente
 identifica corretamente o seu dispositivo.</para>
@@ -29,36 +42,34 @@ identifica corretamente o seu dispositivo.</para>
   <para>Se o instalador não detectou corretamente sua placa de vídeo e você sabe
 identificá-la, você pode selecioná-la a partir da árvore, escolhendo: <itemizedlist>
       <listitem>
-        <para>fabricante</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>em seguida, o nome de sua placa</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>e o tipo de placa</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
-  <para>Se você não consegue encontrar seu cartão nas listas de fornecedores (porque
-ainda não está no banco de dados ou é um cartão mais antigo) você pode
-encontrar um driver adequado na categoria <emphasis
-role="bold">Xorg</emphasis>, que fornece mais mais de 40 drivers de placa de
-vídeo genérica e de código aberto. Se ainda não conseguir encontrar um
-driver específico para sua placa, existe a opção de usar o driver <emphasis
-role="bold">vesa</emphasis>, que fornece recursos básicos.</para>
-
-  <para>Esteja ciente de que, se você selecionar um driver incompatível, poderá ter
-acesso somente à interface <emphasis role="bold">comando de
-linha</emphasis>.</para>
+  <para>If you cannot find your card in the vendor lists (because it's not yet in
+the database or it's an older card) you may find a suitable driver in the
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Alguns fabricantes de placas de vídeo fornecem drivers proprietários para o
-Linux, que podem estar disponíveis apenas no repositório <emphasis
-role="bold">Nonfree</emphasis> e, em alguns casos, apenas nos sites dos
-fabricantes de cartões.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
-  <para>O repositório <emphasis role="bold">Nonfree</emphasis> precisa estar
-explicitamente habilitado para acessá-los. Se você não habilitou
-anteriormente, você deve fazer isso após a primeira reinicialização.</para>
-</section>
\ No newline at end of file
+  <para>Some video card manufacturers provide proprietary drivers for Linux which
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/configureX_chooser.xml b/docs/docs/stable/installer/pt_BR/configureX_chooser.xml
index 2250711c..e9bd53bb 100644
--- a/docs/docs/stable/installer/pt_BR/configureX_chooser.xml
+++ b/docs/docs/stable/installer/pt_BR/configureX_chooser.xml
@@ -1,64 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="pt_BR">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Configuração da placa de vídeo e monitor</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
-
-  <para revision="1" xml:id="configureX_chooser-pa1">Não importa qual ambiente gráfico (também conhecido como ambiente de
-desktop) você escolheu para esta instalação do
-<application>Mageia</application>, eles são todos baseados em um sistema de
-interface gráfica chamado <acronym>X Window System</acronym>, ou
-simplesmente <acronym>X</acronym>. Assim, para que o <acronym>KDE</acronym>
-Plasma, o <acronym>GNOME</acronym>, o <acronym>LXDE</acronym> ou qualquer
-outro ambiente gráfico funcione bem, o seguinte <acronym>X</acronym> as
-configurações precisam estar corretas. Escolha as configurações corretas se
-nenhuma for mostrada ou se achar que os detalhes estão incorretos.</para>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
+
+  <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Placa de Vídeo</guibutton></emphasis>: Escolha a sua
-placa da lista, se necessário..</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: Pode escolher o
-<guilabel>Plug'n Play</guilabel>, se aplicável, ou escolher o seu monitor no
-<guilabel>Fornecedor</guilabel> ou <guilabel>Lista
-genérica</guilabel>. Escolha <guilabel>Personalizado</guilabel> se preferir
-definir manualmente as taxas de atualização horizontal e vertical do seu
-monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Taxas de atualização incorreta pode danificar o seu monitor</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolução</guibutton></emphasis>: A resolução e
-profundidade de cor do seu monitor podem ser definidas aqui.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Teste</guibutton></emphasis>: O botão de teste nem
-sempre aparece durante a instalação. Se a opção estiver lá e você testar
-suas configurações, pergunte se as configurações estão corretas. Se você
-responder <emphasis role="bold">sim</emphasis>, as configurações serão
-mantidas. Se você não vir nada, retornará à tela de configuração e poderá
-reconfigurar tudo até que o resultado do teste seja satisfatório. Se a opção
-de teste não estiver disponível, verifique se as configurações estão no lado
-seguro.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Opções</guibutton></emphasis>: Aqui você pode optar por
-ativar ou desativar várias opções.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/configureX_monitor.xml b/docs/docs/stable/installer/pt_BR/configureX_monitor.xml
index ad111fb0..6982e675 100644
--- a/docs/docs/stable/installer/pt_BR/configureX_monitor.xml
+++ b/docs/docs/stable/installer/pt_BR/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="pt_BR">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,63 +23,82 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Escolhendo seu Monitor</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX tem um banco de dados bastante extenso de monitores e geralmente
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX tem um banco de dados bastante extenso de monitores e geralmente
 identificará corretamente o seu.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecionar um monitor com características diferentes
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecionar um monitor com características diferentes
 pode danificar seu monitor ou hardware de vídeo. Por favor, não tente algo
 sem saber o que está fazendo.</emphasis> Em caso de dúvida, você deve
 consultar a documentação do seu monitor.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Personalizado</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Esta opção permite você definir dois parâmetros importantes, a taxa de
-atualização vertical e da taxa de sicronização horizontal. A atualização
-vertical determina a frequência que a tela será atualizada e a sicronização
-horizontal é a taxa de linhas que serão exibidas.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">É <emphasis>MUITO IMPORTANTE</emphasis> que você não especifique um tipo de
+        <para revision="1" xml:id="configureX_monitor-pa4">É <emphasis>MUITO IMPORTANTE</emphasis> que você não especifique um tipo de
 monitor com uma gama de sincronização que está além das capacidades do seu
 equipamento: você pode danificá-lo. Em caso de dúvidas, escolha uma
 configuração conservadora e consulte a documentação de seu monitor.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">É a opção padrão e tenta determinar o tipo de monitor no banco de dados.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Fabricante</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">Se o instalador não detectou corretamente o seu monitor e você sabe
-identificá-lo, você pode selecioná-lo a partir da árvore, escolhendo: <itemizedlist>
       <listitem>
-        <para>fabricante</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>o nome do fabricante do monitor</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>a descrição do monitor</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Se o instalador não detectou corretamente o seu monitor e você sabe
+identificá-lo, você pode selecioná-lo a partir da árvore, escolhendo:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Generic</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">A seleção desse grupo listará cerca de 30 configurações de exibição, como
-1024x768 @ 60Hz, e incluirá monitores de tela plana usados em
-laptops. Geralmente, esse é um bom grupo de seleção de monitores se você
-precisar usar o driver da placa <emphasis role="bold">Vesa</emphasis> quando
-o hardware de vídeo não puder ser determinado automaticamente. Mais uma vez,
-pode ser prudente ser conservador em suas seleções.</para>
-</section>
\ No newline at end of file
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/diskPartitioning.xml b/docs/docs/stable/installer/pt_BR/diskPartitioning.xml
new file mode 100644
index 00000000..1e23587c
--- /dev/null
+++ b/docs/docs/stable/installer/pt_BR/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="pt_BR" version="5.0" xml:lang="pt_BR">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/diskdrake.xml b/docs/docs/stable/installer/pt_BR/diskdrake.xml
index d3beb40d..d601217a 100644
--- a/docs/docs/stable/installer/pt_BR/diskdrake.xml
+++ b/docs/docs/stable/installer/pt_BR/diskdrake.xml
@@ -1,68 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt_BR" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Personalização do particionamento de disco com DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">Se você deseja usar criptografia em sua partição <emphasis
-role="bold">/</emphasis>, você deve garantir que você tenha uma partição
-<emphasis role="bold">/ boot</emphasis> separada. A opção de criptografia
-para a partição <emphasis role="bold"></emphasis>/ boot NÃO deve ser
-definida, caso contrário, o sistema não será inicializado.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modifique o layout de seu disco(s) aqui. Você pode remover ou criar
-partições, alterar o sistema de arquivos de uma partição ou alterar seu
-tamanho e até mesmo visualizar seus detalhes antes de começar.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">Há uma guia, na parte superior, para cada unidade de disco rígido detectado
-(ou outro dispositivo de armazenamento, com ligação semelhante a USB). Na
-imagem de tela acima, há dois dispositivos disponíveis: <emphasis
-role="bold">sda</emphasis> e <emphasis role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa5" revision="1">Tome cuidado com a opção <guibutton>Limpar tudo</guibutton>, use-o somente
-se tiver certeza de que deseja limpar todas as partições no dispositivo de
-armazenamento selecionado</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6" revision="1">Para todas as outras ações: clique, primeiro, na partição desejada. Em
-seguida, visualize-a ou escolha um sistema de arquivos (<i>file system</i>)
-e um ponto de montagem, redimensione-o ou limpe-o. O modo especialista
-(<guibutton>expert mode</guibutton>  fornece mais opções, como, por exemplo,
-um rótulo para nomear uma partição, ou para escolher um tipo de partição.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue até que você tenha ajustado tudo para sua satisfação.</para>
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Click <guibutton>Ok</guibutton> quando estiver pronto.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>Se você estiver instalando o Mageia em um sistema UEFI, verifique se existe,
-em seu disco,  uma partição do tipo  ESP (EFI System Partition) e se ela
-está marcada para montagem na pasta / boot / EFI (veja abaixo)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>Se você estiver instalando o Mageia em um sistema Legacy / GPT, verifique se
-uma partição de inicialização do BIOS está presente com um tipo correto</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/doPartitionDisks.xml b/docs/docs/stable/installer/pt_BR/doPartitionDisks.xml
index feded142..31ed287c 100644
--- a/docs/docs/stable/installer/pt_BR/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/pt_BR/doPartitionDisks.xml
@@ -1,176 +1,215 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt_BR" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
+
+  
 
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Particionamento</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">Nesta tela você pode ver o conteúdo de seu (s) disco (s) rígido (s),
-juntamente com as propostas de particionamento, do DrakX, para a instalação
-do <application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">As opções disponíveis das mostradas abaixo irão variar de acordo com o
-layout e o conteúdo de seu (s) disco (s) rígido (s) específico (s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Utilizar as partições existentes</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">Se esta opção estiver disponível, então partições existentes compatíveis com
+      <para revision="1" xml:id="doPartitionDisks-pa5">Se esta opção estiver disponível, então partições existentes compatíveis com
 o Linux foram encontrados e podem ser utilizadas para a instalação.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Usar o espaço livre</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">Se você tiver espaço não utilizado em seu disco rígido, então esta opção irá
+      <para revision="1" xml:id="doPartitionDisks-pa7">Se você tiver espaço não utilizado em seu disco rígido, então esta opção irá
 usá-lo para a sua nova instalação da Mageia.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Use o espaço livre na partição do Windows</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
+
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
+
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">Se você tiver espaço não utilizado em uma partição existente do Windows, o
-instalador pode oferecer para usá-lo.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">Esta pode ser uma maneira útil de obter espaço para a sua nova instalação da
-Mageia, mas é uma operação arriscada, por isso você deve ter a certeza de
-ter um backup de todos os arquivos importantes!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Note que isto envolve a redução do tamanho da partição do Windows. A
 partição deve ser "limpa", o que significa que o Windows deve ter fechado
 corretamente na última vez que foi usado. Deve também ter sido
 desfragmentado, embora isto não seja uma garantia de que todos os arquivos
 da partição foram movidos para fora da área que está prestes a ser usada. É
 altamente recomendável fazer backup de seus arquivos pessoais.</para>
+      </important>
+    </listitem>
 
-        <para>Com esta opção, o instalador exibe a partição restante do Windows em azul
-claro e a partição Mageia proposta em azul escuro com os tamanhos
-pretendidos logo abaixo. Você tem a opção de modificar esses tamanhos
-clicando e arrastando a lacuna entre as duas partições. Veja a seguinte
-captura de tela.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Apagar e utilizar o Disco Inteiro.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa13" revision="1">Essa opção alocará a unidade inteira para a Mageia.</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">Isso lhe dará total controle sobre o local da instalação em seu(s) disco(s)
+rígido(s).</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Atenção! Esta operação apagará todos os dados do disco rígido
-selecionado. Tenha cuidado!</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>Se o espaço total disponível for maior que 50 GB, então três partições serão
+criadas</para>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">Se você pretende utilizar parte do disco rígido para finalidade, ou você já
-tem dados na unidade que você não deseja perder, então não utilize esta
-opção.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Personalizar Particionamento</para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">Isso lhe dará total controle sobre o local da instalação em seu(s) disco(s)
-rígido(s).</para>
-      </listitem>
-    </itemizedlist></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Dimensionamento de partição:</emphasis></para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para>Se você não estiver usando a <emphasis role="bold">opção
-personalizada</emphasis> de particionamento do disco,  o instalador alocará
-o espaço disponível de acordo com as seguintes regras:</para>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>Se o espaço total disponível for menor que 50 GB, apenas uma partição será
-criada. Esta será a partição <emphasis role='bold'>/</emphasis> (root).</para>
-      </listitem>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-      <listitem>
-        <para>Se o espaço total disponível for maior que 50 GB, então três partições serão
-criadas</para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 do total do local disponível é alocado para <emphasis
-role="bold">/</emphasis> com um máximo de 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 é alocado para área de troca com um máximo de 4 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>o resto (pelo menos 12/19) é atribuído a <emphasis role="bold">/
-home.</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
-
-  <para>Isso significa que, a partir de 160 GB ou mais de espaço disponível, o
-instalador criará três partições: 50 GB para <emphasis
-role='bold'>/</emphasis>, 4 GB para <emphasis role='bold'>swap
-(troca)</emphasis> e o restante para <emphasis role='bold'>/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para>Se você estiver usando um sistema UEFI, o ESP (EFI System Partition) será
-detectado automaticamente ou criado, se ainda não existir, e montado em /
-boot / EFI. A opção <emphasis role='bold'>personalizada</emphasis> de
-particionamento de disco é a única que permite verificar se foi feito
-corretamente</para>
+    <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>Se você estiver usando um sistema legado (CSM ou BIOS) com um disco GPT,
-será necessário criar uma partição de inicialização no formato BIOS, caso
-ainda não exista. É uma partição de aproximadamente 1 MiB sem ponto de
-montagem. Escolha <xref linkend="diskdrake"/> para poder criá-la com o
-Instalador, como qualquer outra partição. Basta selecionar a partição de
-inicialização no formato BIOS como o tipo de sistema de arquivos.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para>Algumas unidades mais recentes usam setores lógicos de 4096 bytes, em vez do
-padrão anterior de 512. Devido à falta de "hardware" disponível, a
-ferramenta de particionamento, usada no instalador, não foi testada com esse
-tipo de  unidade. Além disso, alguns dispositivos SSD agora usam um tamanho
-de bloco de apagamento acima de 1 MB. Se você tiver um dispositivo desse
-tipo, sugerimos que particione a unidade com antecedência, usando uma
-ferramenta de particionamento alternativa, como o <emphasis
-role='bold'>gparted</emphasis>, e use as seguintes configurações:</para>
+  <important>
+    <para>Some newer drives are now using 4096 byte logical sectors, instead of the
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
 
-    <para><emphasis role="bold">Alinhar para</emphasis> = MiB</para>
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Espaço livre anterior (MiB)</emphasis>=2</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Certifique-se também de que todas as partições sejam criadas usando um
 número par de megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/exitInstall.xml b/docs/docs/stable/installer/pt_BR/exitInstall.xml
index 6ce5f163..b7f656c4 100644
--- a/docs/docs/stable/installer/pt_BR/exitInstall.xml
+++ b/docs/docs/stable/installer/pt_BR/exitInstall.xml
@@ -5,22 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">Você terminou de instalar e configurar a <application>Mageia</application> e
-agora é seguro remover a mídia de instalação e reiniciar o seu computador.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">Após a reinicialização, na tela do bootloader, você pode escolher entre os
-sistemas operacionais (se houver mais de um) em seu computador.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">Se você não ajustar as configurações no Gerenciador de Inicialização, sua
 instalação Mageia será automaticamente selecionada e iniciada.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Divirta-se!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Visite o site www.mageia.org se você tiver dúvidas ou quiser contribuir para
-a Mageia</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/firewall.xml b/docs/docs/stable/installer/pt_BR/firewall.xml
index 56c118ad..e091ce6f 100644
--- a/docs/docs/stable/installer/pt_BR/firewall.xml
+++ b/docs/docs/stable/installer/pt_BR/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="pt_BR">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="pt_BR" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Firewall</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Firewall</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">Esta seção permite configurar algumas regras de "firewall" simples: elas
@@ -8,24 +14,24 @@ determinam qual tipo de mensagem da internet será aceito pelo sistema
 destino. Isso, por sua vez, permite que os serviços correspondentes, no
 sistema, sejam acessíveis pela internet.</para>
 
-  <para>Na configuração padrão (nenhum botão está marcado), nenhum serviço do
-sistema é acessível pela rede. O <emphasis role='bold'>"Everything" (sem
-"firewall")</emphasis> permite o acesso a todos os serviços da máquina - uma
-opção que não faz muito sentido, no contexto do instalador pois, criaria um
-sistema totalmente desprotegido. Seu verdadeiro uso está no contexto do
-"Mageia Control Center" (MCC - que usa o mesmo layout de GUI) para
-desabilitar temporariamente todo o conjunto de regras de 'firewall" para
-fins de teste e depuração.</para>
+  <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
 
-  <para>Todas as outras opções são, mais ou menos, auto explicativas. Por exemplo,
-você ativará o servidor <emphasis role="bold">CUPS</emphasis> se quiser que
-as impressoras em sua máquina sejam acessíveis a partir da rede.</para>
+  <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Avançado</emphasis></para>
 
-  <para>A opção "Advanced (avançado)" abre uma janela onde você pode ativar uma
-série de serviços digitando uma lista de pares. (separados por um espaço em
-branco)</para>
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
 
diff --git a/docs/docs/stable/installer/pt_BR/formatPartitions.xml b/docs/docs/stable/installer/pt_BR/formatPartitions.xml
index 4ca54d32..38e4c2bc 100644
--- a/docs/docs/stable/installer/pt_BR/formatPartitions.xml
+++ b/docs/docs/stable/installer/pt_BR/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="pt_BR">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formatação</title>
   </info>
@@ -11,35 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"><imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/></imageobject><imageobject
-condition="live"><imagedata format="PNG" xml:id="live-formatPartitions-im1"
-align="center" fileref="live-formatPartitions.png"
-revision="1"/></imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Aqui você pode escolher quais partições deseja formatar. Quaisquer dados, em
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Aqui você pode escolher quais partições deseja formatar. Quaisquer dados, em
 partições não marcadas para formatação, serão preservados.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Normalmente, pelo menos as partições DrakX selecionados precisam ser
-formatadas</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Clique em <guibutton>Avançado</guibutton> para escolher as partições que
-você deseja verificar os chamados <emphasis>bad blocks</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">Se você não tiver certeza de ter feito a escolha certa, clique em
-<guibutton>Anterior</guibutton>, novamente em
-<guibutton>Anterior</guibutton> e depois em
-<guibutton>Personalizado</guibutton> para voltar à tela principal, onde você
-pode optar por visualizar os detalhes de suas partições.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">Quando você estiver confiante em relação a seleção, clique em
-<guibutton>Próximo</guibutton> para continuar.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/graphicalConfiguration.xml b/docs/docs/stable/installer/pt_BR/graphicalConfiguration.xml
new file mode 100644
index 00000000..3ae0c7af
--- /dev/null
+++ b/docs/docs/stable/installer/pt_BR/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/installUpdates.xml b/docs/docs/stable/installer/pt_BR/installUpdates.xml
index 038bcd8b..9686d552 100644
--- a/docs/docs/stable/installer/pt_BR/installUpdates.xml
+++ b/docs/docs/stable/installer/pt_BR/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="pt_BR">
-  <info>
-    <title xml:id="installUpdates-ti1">Atualizações</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Atualizações</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Desde que esta versão da <application>Mageia</application> foi lançada,
-alguns pacotes foram atualizados ou melhorados.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Escolha <guilabel>Sim</guilabel> caso queira fazer o "download" e
-instalá-los ou, selecione <guilabel>Não</guilabel> se não quiser fazer isso
-agora ou se não estiver conectado à Internet</para>
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Pressione <guibutton>Next</guibutton> para continuar.</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/installer.xml b/docs/docs/stable/installer/pt_BR/installer.xml
index ae244d5d..21872d34 100644
--- a/docs/docs/stable/installer/pt_BR/installer.xml
+++ b/docs/docs/stable/installer/pt_BR/installer.xml
@@ -6,168 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, o Instalador da Mageia</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, o Instalador da Mageia</title>
   </info>
 
   <para>Se você é novo no GNU-Linux ou um usuário experiente, o Instalador da Mageia
 foi feito para ajudar a fazer sua instalação ou atualização tão fácil quando
 possível.</para>
 
-  <para>A tela do menu inicial tem várias opções, porém a opção padrão irá iniciar o
-instalador, que será, normalmente, tudo o que você irá precisar.</para>
+  <section>
+    <title>As etapas de instalação</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Primeira Tela da Instalação</title>
 
-    <section>
-      <title>Usando um DVD Mageia</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
+
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
 
-      <para>Aqui estão as telas de boas-vindas padrão, ao usar um DVD da Mageia. A
-primeira delas é o que você verá se tiver um sistema UEFI; a segunda será
-para um sistema Legado:</para>
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>A partir desta tela, você tem acesso às opções pressionando "<emphasis
-role='bold'>e</emphasis>" para entrar no modo de edição. Para voltar a esta
-tela, pressione a tecla <emphasis role='bold'>Esc</emphasis> para sair sem
-salvar ou pressione a tecla <emphasis role='bold'>Ctrl</emphasis> ou
-<emphasis role='bold'>F10</emphasis> para sair com o salvamento.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>Nesta tela, é possível definir algumas preferências (observe que as opções
-<emphasis role="bold">F1</emphasis> a <emphasis role="bold">F6</emphasis>
-estão disponíveis apenas em sistemas Legacy):<itemizedlist>
-          <listitem>
-            <para>Em qualquer uma das opções de<emphasis role="bold"> F2</emphasis> a
-<emphasis role="bold">F6</emphasis>, você pode visualizar a ajuda relevante
-pressionando <emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Pressione <emphasis role="bold">F2</emphasis> para que o instalador use um
-idioma específico para a instalação.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use as teclas de seta para selecionar o idioma e pressione <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>Se necessário, altere a resolução da tela pressionando F3 (somente no modo
-"legacy" [<emphasis role='italic'>herança</emphasis>).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Se você tiver problemas com a instalação, poderá tentar modificar as
-configurações padrão usando as <emphasis role="bold">Opções do Kernel -
-F6</emphasis> (para sistemas UEFI, pressione "<emphasis
-role="bold">e</emphasis>").</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Padrão: não altera nada nas opções padrão.</para>
-              </listitem>
-
-              <listitem>
-                <para>Configurações Seguras: A prioridade é dada às opções mais seguras em
-detrimento do  desempenho.</para>
-              </listitem>
-
-              <listitem>
-                <para>Sem ACPI (Configuração avançada e interface de energia): os recursos de
-gerenciamento de energia não são usados.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>Não APIC local: (Controlador de interrupção programável avançada local):
-interrupção da CPU. Selecione esta opção se você tiver um mau comportamento
-do sistema como um <emphasis role='bold'>kernel panic</emphasis> em relação
-ao APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>Quando você seleciona uma destas entradas, ele modifica as opções padrão
-exibido nas <guilabel>opções de inicialização</guilabel> linha.</para>
-
-            <note>
-              <para>Em algumas versões da Mageia, pode acontecer que as entradas selecionadas
-com F6 não apareçam na linha "Boot Options". Apesar disso, elas serão de
-fato aplicadas.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressionar <emphasis role="bold">F1</emphasis> abre uma janela de ajuda para
-várias opções de inicialização. Selecione um item com as teclas de seta e
-pressione <emphasis role="bold">Enter</emphasis> para mais detalhes, ou
-pressione <emphasis role="bold">Esc</emphasis> para voltar à tela de
-boas-vindas.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>A visão detalhada sobre a opção inicial (splash). Pressione <emphasis
-role="bold">Esc</emphasis> ou selecione <guilabel>Retornar às opções de
-inicialização</guilabel> para voltar à lista de opções. Essas opções podem
-ser adicionadas manualmente na linha <guilabel>Boot Options</guilabel>.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>A ajuda é traduzida no idioma escolhido com
-<emphasis role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>Para obter mais informações sobre as opções de kernel em sistemas legados e
-UEFI, consulte: <link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>As etapas de instalação</title>
+    <section>
+      <title>UEFI Systems</title>
+
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
+
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>O processo de instalação é dividido em várias etapas, cujo status é indicado
-em um painel à esquerda da tela.</para>
-
-    <para>Cada etapa tem uma ou mais telas que também podem ter seções
-<guibutton>Avançadas</guibutton> com opções extras, menos comumente
-necessárias.</para>
-
-    <para>A maioria das telas possui botões de <guibutton>Ajuda</guibutton> para mais
-detalhes sobre a etapa específica.</para>
-
-    <note>
-      <para>Se em alguns pontos durante a instalação você decidir parar a instalação, é
-possível reinicializar, mas, por favor, pense duas vezes antes de fazer
-isso. Depois que uma partição tiver sido formatada ou as atualizações
-começarem a ser instaladas, seu computador não estará mais no mesmo estado e
-a reinicialização poderá deixá-lo com um sistema inutilizável. Se, apesar
-disso, você tiver certeza de que a reinicialização é o que deseja, vá para
-um terminal de texto pressionando as três teclas <guibutton>Alt Ctrl
-F2</guibutton> ao mesmo tempo. Depois disso, pressione <guibutton>Alt Ctrl
-Delete</guibutton> simultaneamente para reinicializar.</para>
-    </note>
+      <itemizedlist>
+        <title>Menu</title>
+
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -178,20 +174,20 @@ Delete</guibutton> simultaneamente para reinicializar.</para>
 
       <itemizedlist>
         <listitem>
-          <para>Após a tela inicial, você não chegou na tela de seleção de idioma.  Isto
-pode acontecer com algumas placas de vídeos e sistemas antigos. Tente usar
-uma resolução baixa teclando <code>vgalo</code> na tela de prompt
-(modo-texto).</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
-          <para>Se o hardware for muito antigo, uma instalação gráfica pode não ser
-possível. Nesse caso, vale a pena tentar uma instalação em modo texto. Para
-isso, pressione <emphasis role="bold">Esc</emphasis> na primeira tela de
-boas vindas e confirme com <emphasis role="bold">ENTER</emphasis>. Será
-apresentada uma tela preta com a palavra "boot:". Digite "texto" e pressione
-<emphasis role="bold">ENTER</emphasis> para continuar com a instalação no
-modo de texto.</para>
+          <para>If the hardware is very old, a graphical installation may not be
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -199,31 +195,30 @@ modo de texto.</para>
     <section>
       <title>A Instalação Congela</title>
 
-      <para>Se o sistema parece congelar durante a instalação, isto pode ser um problema
-com a detecção de hardware. Neste caso, a detecção automática de hardware
-pode ser ignorada e tratada mais tarde. Para tentar desta forma, tecle
-<code>noauto</code> no prompt (tela modo-texto). Esta opção pode também ser
-combinada com outras opções, conforme necessário.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
       <title>Problema RAM</title>
 
-      <para>Isso raramente será necessário, mas em alguns casos, o hardware pode relatar
-a memória (RAM) disponível incorretamente. Para especificar isso
-manualmente, você pode usar o parâmetro <code>mem = xxxM</code>, em que xxx
-é a quantidade correta de memória (RAM). por exemplo. <code>mem =
-256M</code> especificaria 256MB de RAM.</para>
+      <para>This will rarely be needed, but in some cases the hardware may report the
+available RAM incorrectly. To specify this manually, you can use the
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Partições Dinâmicas</title>
 
-      <para>Se você converteu seu disco rígido do formato <emphasis
-role="bold">básico</emphasis> para o formato <emphasis
-role="bold">dinâmico</emphasis> no Microsoft Windows, não será possível
-instalar a Mageia neste disco. Para reverter para um disco básico, consulte
-a documentação da Microsoft: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/pt_BR/locale.xml b/docs/docs/stable/installer/pt_BR/locale.xml
new file mode 100644
index 00000000..e9d545bc
--- /dev/null
+++ b/docs/docs/stable/installer/pt_BR/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/login.xml b/docs/docs/stable/installer/pt_BR/login.xml
index f2815f21..2cbf44f8 100644
--- a/docs/docs/stable/installer/pt_BR/login.xml
+++ b/docs/docs/stable/installer/pt_BR/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="pt_BR"><info><title xml:id="label-to-adapt-ti1">Tela de Login</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finalmente, você chegará à tela de login.</para><para>Digite seu nome de usuário e senha, e em poucos segundos você estará com o
-ambiente de trabalho KDE ou GNOME  carregado, dependendo de qual  Mídia você
-usou. Agora você pode começar a usar a sua instalação Mageia.</para><para>Você pode encontrar outra parte de nossa documentação em <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">o wiki
-Mageia</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="pt_BR">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/media_selection.xml b/docs/docs/stable/installer/pt_BR/media_selection.xml
index d58e5e1c..e679b39c 100644
--- a/docs/docs/stable/installer/pt_BR/media_selection.xml
+++ b/docs/docs/stable/installer/pt_BR/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="pt_BR">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Seleção de Mídia (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Aqui você tem uma lista dos repositórios disponíveis. Nem todos os
 repositórios estarão disponíveis, dependendo do tipo de mídia que você
@@ -32,11 +41,11 @@ que ele contém a base da distribuição.</para>
     </listitem>
 
     <listitem>
-      <para>O repositório <emphasis>Nonfree</emphasis>  inclui pacotes que são
-gratuitos, isto é. O Mageia pode redistribui-los, mas eles contêm o software
-de closed-source (daqui o nome - Não-gratuito). Por exemplo este repositório
-inclui nVidia e o cartão de gráficos ATI motoristas proprietários, firmware
-de vários cartões WiFi, etc.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/pt_BR/minimal-install.xml b/docs/docs/stable/installer/pt_BR/minimal-install.xml
index 21d92eb0..bf2d0e94 100644
--- a/docs/docs/stable/installer/pt_BR/minimal-install.xml
+++ b/docs/docs/stable/installer/pt_BR/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="pt_BR">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="pt_BR">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Instalação Mínima</title>
   </info>
@@ -10,32 +13,44 @@
 
   
 
-  <para>Você pode escolher uma instalação mínima, desmarcando tudo na tela "Seleção
-de Grupo de Pacotes", veja.
-<xref linkend="choosePackageGroups"/></para>
-
-  <para>Se desejar, você pode marcar, adicionalmente, a opção <emphasis
-role="bold">Seleção Individual de Pacote</emphasis> na mesma tela.</para>
+  
 
-  <para>A Instalação Mínima é destinada àqueles que têm usos específicos em mente
-para a <application>Mageia</application>, como um servidor ou uma estação de
-trabalho especializada. Você provavelmente usará essa opção combinada com a
-opção <emphasis role="bold">Seleção Individual de Pacote</emphasis>,
-mencionada acima. Para ajustar sua instalação, veja <xref
-linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>Se você escolher este método de instalação, a tela relevante oferecerá
-alguns extras úteis para instalação, como documentação e X.</para>
+  
 
-  <para>Se <emphasis role="bold">Com X</emphasis> for escolhido, o IceWM (um
-ambiente de área de trabalho leve) também será incluído.</para>
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
 
-  <para>A documentação básica é fornecida sob a forma de páginas man e info. Nela
-contém as páginas man do <link
-xlink:href="http://www.tldp.org/manpages/man.html"> Projeto de Documentação
-do Linux </link> e  <link
-xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU coreutils
-</link> páginas info.</para>
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
+xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
+Project</link> and the <link
+xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
+coreutils</link> info pages.</para>
 
   <mediaobject>
 <imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
diff --git a/docs/docs/stable/installer/pt_BR/misc-params.xml b/docs/docs/stable/installer/pt_BR/misc-params.xml
index 42204a7a..7f9dcc45 100644
--- a/docs/docs/stable/installer/pt_BR/misc-params.xml
+++ b/docs/docs/stable/installer/pt_BR/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt_BR" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Resumo de diversos parâmetros</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
-
-  <para xml:id="misc-params-pa1" revision="1">O DrakX apresenta uma proposta para a configuração do seu sistema,
-dependendo das escolhas feitas e do hardware detectado. Você pode verificar
-as configurações aqui e alterá-las, se quiser, pressionando
-<guibutton>Configurar</guibutton>.</para>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+  <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>Como regra geral, é recomendável que você aceite as configurações padrão, a
@@ -26,7 +42,7 @@ menos que:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>algum outro fator mencionado nas seções detalhadas abaixo é um problema.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,48 +54,48 @@ menos que:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Fuso horário</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX seleciona um fuso horário para você, dependendo do seu idioma
-preferido. Você pode alterá-lo, se necessário. Veja também<xref
-linkend="configureTimezoneUTC"/></para>
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>País / Região</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">Se o país selecionado estiver errado, é muito importante que você corrija a
 configuração. Veja <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Gerenciador de Inicialização</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX fez boas opções para a configuração do gerenciador de inicialização.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Não altere nada, a menos que você saiba como configurar o GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Para mais informações, consulte <xref linkend="setupBootloader"></xref></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Gerenciamento de usuário</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Você pode adicionar usuários extras aqui. Cada um deles irão receber seus
-próprios diretórios na pasta <literal>/home</literal>.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Serviços</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">Os serviços do sistema referem-se aos pequenos programas executados em
 segundo plano (daemons). Esta ferramenta permite ativar ou desativar
 determinados processos.</para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Você deve verificar cuidadosamente antes de alterar qualquer coisa aqui - um
-erro pode impedir o seu computador de funcionar corretamente.</para>
-
-        <para>Para mais informações, consulte <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -91,7 +107,7 @@ erro pode impedir o seu computador de funcionar corretamente.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Teclado</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure o layout do seu teclado de acordo com sua localização, idioma e
 tipo de teclado.</para>
@@ -103,27 +119,32 @@ que suas senhas também vão mudar.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Mouse</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Aqui você pode adicionar ou configurar outros dispositivos apontadores,
 tablets, trackballs, etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Placa de Som</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">O instalador usa o driver padrão - se houver um padrão. A opção para
-selecionar um driver diferente é dada somente quando há mais de um driver
-para sua placa, mas nenhum deles é o padrão.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Interface Gráfica</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Esta secção permite-lhe configurar sua placa(s) de vídeo(s) e monitores.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Para mais informação, consulte <xref linkend="configureX_chooser"></xref>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -138,12 +159,12 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Rede</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
-        <para xml:id="misc-params-network-pa2" revision="1">Você pode configurar sua rede aqui, mas para placas de rede com drivers
-não-livres, é melhor fazer isso após a reinicialização, usando o
-<application>Centro de Controle Mageia</application>, se você ainda não
-habilitou os repositórios de mídia Nonfree.</para>
+        <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
+repositories.</para>
 
         <warning>
           <para xml:id="misc-params-network-pa3" revision="1">Quando você adiciona uma placa de rede, não se esqueça de configurar seu
@@ -152,14 +173,14 @@ firewall para monitorar essa interface também.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxies</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">Um Servidor Proxy atua como um intermediário entre o computador e a
-Internet.  Esta secção permite-lhe configurar o computador para utilizar um
-serviço proxy.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">Pode ser necessário consultar o administrador do sistema para obter os
-parâmetros que você precisa inserir aqui.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -171,26 +192,31 @@ parâmetros que você precisa inserir aqui.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Nível de Segurança</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Aqui você define o Nível de Segurança para seu computador, na maioria dos
-casos, a configuração padrão (Standard) é adequada para uso geral.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Verifique a opção que melhor se adapta ao seu uso.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Firewall</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">Um firewall pretende ser uma barreira entre seus dados importantes e os
-patifes lá fora, na internet, que possam comprometer ou roubar eles.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Selecione os serviços que você deseja ter acesso ao seu sistema. Suas
-seleções dependerão do uso do computador. Para obter mais informações,
-consulte <xref linkend = "firewall" />.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Ter em mente que permitir tudo (sem firewall) pode ser muito arriscado.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/pt_BR/reboot.xml b/docs/docs/stable/installer/pt_BR/reboot.xml
index b107a4c1..fb783234 100644
--- a/docs/docs/stable/installer/pt_BR/reboot.xml
+++ b/docs/docs/stable/installer/pt_BR/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="pt_BR" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Reboot</title>
   </info>
   
-  <para>Uma vez instalado o bootloader, você será solicitado a interromper o
-computador, remover o CD ao vivo e reiniciar o computador, clicar em
-<emphasis role = "bold"> <guibutton> Concluir </guibutton> </emphasis> e
-agir como <emphasis role = "bold">nesta ordem!</emphasis></para>
+  
+  <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>Quando você reiniciar, você verá uma sucessão de barras de progresso de
-download. Isso indica que as listas de mídia de software estão sendo
-baixadas (consulte Gerenciamento de software).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/pt_BR/securityLevel.xml b/docs/docs/stable/installer/pt_BR/securityLevel.xml
index 7b0d303b..05a52811 100644
--- a/docs/docs/stable/installer/pt_BR/securityLevel.xml
+++ b/docs/docs/stable/installer/pt_BR/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt_BR" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Nível de Segurança</title>
   </info>
@@ -7,28 +14,32 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Por favor, escolha o nível de segurança
 desejado</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Padrão</emphasis> é a configuração mais utilizada e
-recomendada para o usuário médio. A configuração <emphasis
-role="bold">Secure</emphasis> criará um sistema altamente protegido, por
-exemplo, se o sistema for usado como um servidor público.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Administrador de Segurança</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">Este item permite configurar um endereço de e-mail para o qual o sistema
+  <para revision="1" xml:id="securityLevel-pa2">Este item permite configurar um endereço de e-mail para o qual o sistema
 enviará <emphasis>mensagens de alerta de segurança</emphasis> quando
 detectar situações que exijam notificação ao administrador do sistema.</para>
 
-  <para>Uma opção boa escolha, fácil de implementar, é inserir &lt;user>@localhost,
-onde "&lt;user" é o nome de "login" do usuário que receberá essas mensagens.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>O sistema envia tais mensagens como <emphasis role="bold">Unix Mailspool
@@ -36,6 +47,6 @@ messgaes</emphasis>, não como mensagens SMTP "normais": este usuário deve
 ser configurado para receber tais mensagens!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">Após a instalação, sempre será possível ajustar suas configurações de
-segurança na seção <guilabel>Segurança</guilabel> do Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/selectCountry.xml b/docs/docs/stable/installer/pt_BR/selectCountry.xml
index 720d56cb..261a5218 100644
--- a/docs/docs/stable/installer/pt_BR/selectCountry.xml
+++ b/docs/docs/stable/installer/pt_BR/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="pt_BR">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="pt_BR">
   <info>
     <title xml:id="selectCountry-ti1">Selecione seu país / região</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Selecione seu país ou região. Isso é importante para todos os tipos de
-configurações, como a moeda e o domínio de regulamentação sem fio. Definir o
-país errado pode levar a não ser capaz de usar uma rede sem fio.</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+like the currency and wireless regulatory domain. Setting the wrong country
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">Se o seu país não estiver na lista, clique na opção <guilabel>Outros
-países</guilabel> e escolha seu país / região.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">Se o seu país estiver apenas na lista <guilabel>Outros países</guilabel>,
-depois de clicar em <guibutton>OK</guibutton>, pode parecer que um país da
-primeira lista foi escolhido. Por favor, ignore isso, pois o "DrakX"
-aplicará sua escolha real.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,20 +40,19 @@ aplicará sua escolha real.</para>
       <title xml:id="inputMethod-ti7">Método de entrada</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">Na tela <guilabel>Outros Países</guilabel>, você também pode selecionar um
-método de entrada (na parte inferior da lista). Os métodos de entrada
-permitem que os usuários insiram caracteres multilíngues (chinês, japonês,
-coreano, etc). O "IBus" é o método de entrada padrão, portanto, os usuários
-não precisam configurá-lo manualmente. Outros métodos de entrada (SCIM,
-GCIN, HIME, etc) também fornecem funções similares e podem ser instalados,
-se você tiver adicionado mídia HTTP / FTP antes da seleção do pacote.</para>
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
+input method (at the bottom of the list). Input methods allow users to input
+multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
+default input method, so users should not need to configure it
+manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
+functions and can be installed if you added HTTP/FTP media before package
+selection.</para>
 
     <note>
-      <para xml:id="selectCountry-pa5" revision="1">Se você perdeu a configuração do método de entrada durante a instalação,
-você pode acessá-lo depois de inicializar o sistema instalado via <emphasis
-role="bold">Configure seu Computer</emphasis> -> <emphasis
-role="bold">Sistema</emphasis>, ou executando "localedrake" com permissões
-de "root".</para>
+      <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/selectInstallClass.xml b/docs/docs/stable/installer/pt_BR/selectInstallClass.xml
index 2b1059c6..8d4e1b4b 100644
--- a/docs/docs/stable/installer/pt_BR/selectInstallClass.xml
+++ b/docs/docs/stable/installer/pt_BR/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="pt_BR" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Instalar ou atualizar</title>
   </info>
 
   <mediaobject>
-<imageobject><imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/></imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Instalar</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use essa opção para executar uma instalação nova da Mageia. Isso formatará a
-partição raiz (/), mas poderá preservar uma partição "/home" separada.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Atualizar</para>
-
-      <para>Isso pode ser usado para atualizar uma instalação existente da
-<application>Mageia</application>.</para>
-
-      <warning>
-        <para>Apenas a atualização de uma versão anterior da Mageia que <emphasis>ainda
-era suportada</emphasis>, quando a versão deste instalador foi lançada, foi
-completamente testada. Se você quer atualizar uma versão Mageia que atingiu
-seu "End Of Life" (fim de vida), então é melhor fazer uma instalação limpa,
-preservando sua partição "<literal>/home</literal>".</para>
-      </warning>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
+
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>Se durante a instalação você decidir parar o processo, é possível
-reinicializar, mas, por favor, pense duas vezes antes de fazer isso. Uma vez
-que uma partição tenha sido formatada ou as atualizações tenham começado a
-ser instaladas, seu computador não estará mais no mesmo estado e a
-reinicialização poderá deixá-lo com um sistema inutilizável. Se, apesar
-disso, e somente se você tiver certeza de que a reinicialização é o que
-deseja, vá para um terminal de texto pressionando <guilabel>Alt Ctrl
-F2</guilabel> simultaneamente. Depois disso, pressione<guilabel> Alt Ctrl
-Delete</guilabel>, simultaneamente, para reiniciar.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
-    <para>Se você descobriu que esqueceu de selecionar um idioma adicional, pode
-voltar da tela <emphasis role="bold">Instalar ou Atualizar</emphasis> para a
-tela de escolha de idioma pressionando <guilabel>Alt Ctrl Home</guilabel>
-simultaneamente. <emphasis role="bold">Não</emphasis> faça isso mais tarde
-na instalação.</para>
+    <para>If you have discovered that you forgot to select an additional language, you
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/selectKeyboard.xml b/docs/docs/stable/installer/pt_BR/selectKeyboard.xml
index f7295926..716e0cf6 100644
--- a/docs/docs/stable/installer/pt_BR/selectKeyboard.xml
+++ b/docs/docs/stable/installer/pt_BR/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="pt_BR">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,20 +19,23 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Teclado</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX seleciona um teclado adequado ao seu idioma. Se nenhum teclado
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX seleciona um teclado adequado ao seu idioma. Se nenhum teclado
 adequado for encontrado, ele será o padrão para um layout de teclado dos
 EUA.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Certifique-se que a seleção está correta ou escolha outro layout de
+      <para revision="1" xml:id="selectKeyboard-pa2">Certifique-se que a seleção está correta ou escolha outro layout de
 teclado. Se você não sabe qual o layout do seu teclado possui, procure nas
 especificações que acompanham o sistema ou peça ao fornecedor do
 computador. Pode até haver uma etiqueta no teclado que identifica o
@@ -28,23 +44,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">Se o seu teclado não estiver na lista mostrada, clique em
-<guibutton>Mais</guibutton> para obter uma lista mais completa e selecione o
-seu teclado lá.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">Depois de escolher um teclado na caixa de diálogo
-<guibutton>Mais</guibutton>, você retornará ao primeiro diálogo de escolha
-do teclado e parecerá que um teclado daquela tela foi escolhido. Você pode
-ignorar isso com segurança e continuar a instalação: o teclado escolhido na
-lista completa será aplicado.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">Se você escolher um teclado baseado em caracteres não latinos, verá uma tela
+      <para revision="1" xml:id="selectKeyboard-pa4">Se você escolher um teclado baseado em caracteres não latinos, verá uma tela
 de diálogo extra, perguntando como você preferiria alternar entre os
 "layouts" de teclado latinos e não latinos.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/selectKeyboardLive.xml b/docs/docs/stable/installer/pt_BR/selectKeyboardLive.xml
index b6924aba..0760b4a1 100644
--- a/docs/docs/stable/installer/pt_BR/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/pt_BR/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt_BR" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Escolha um teclado</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>Você será solicitado à definir o layout de teclado que você deseja usar no
-Mageia. Um único padrão será selecionado de acordo com o idioma e fuso
-horário selecionados anteriormente.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/selectLanguage.xml b/docs/docs/stable/installer/pt_BR/selectLanguage.xml
index ba72c997..1f863d7a 100644
--- a/docs/docs/stable/installer/pt_BR/selectLanguage.xml
+++ b/docs/docs/stable/installer/pt_BR/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="pt_BR" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,51 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Por favor, escolha um idioma para usar</title>
   </info>
 
-  <para condition="classical">Selecione o seu idioma preferido, pela primeira ampliação da lista para o
-seu continente. A <application>Mageia</application> irá utilizar essa
-seleção durante a instalação e para o sistema instalado.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Selecione o seu idioma preferido, pela primeira ampliação da lista para o
-seu continente. A <application>Mageia</application> irá utilizar essa
-seleção durante a instalação e para o sistema instalado.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">Se é possível que você ou outras pessoas necessitem da instalação de vários
-idiomas em seu sistema, use a opção <guibutton>Idiomas múltiplos</guibutton>
-para adicioná-los agora. Será difícil adicionar suporte extra a idiomas após
-a instalação.</para>
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
-    <para>Mesmo se você escolher mais de um idioma, primeiro escolha um deles como seu
-idioma preferido na tela do primeiro idioma. Ele também será marcado como
-escolhido na tela de vários idiomas.</para>
-  </warning>
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
-      <para>Se o idioma do teclado não é o mesmo que o seu idioma preferido, então é
-aconselhável instalar o idioma do teclado também.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia usa o suporte UTF-8 (Unicode) por padrão.</para>
-
-      <para condition="classical">Isso pode ser desativado na tela <emphasis role="bold">Múltiplos
-idiomas</emphasis> se você souber que é inadequado para o seu idioma. A
-desativação do UTF-8 aplica-se a todos os idiomas instalados.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>É possível alterar o idioma do seu sistema após a instalação em Centro de
-Controle Mageia -> Sistema -> Gerenciar localização para seu sistema.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/selectMouse.xml b/docs/docs/stable/installer/pt_BR/selectMouse.xml
index 1a11575f..b6e1424d 100644
--- a/docs/docs/stable/installer/pt_BR/selectMouse.xml
+++ b/docs/docs/stable/installer/pt_BR/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="pt_BR">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Selecione o mouse</title>
   </info>
@@ -7,27 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-selectMouse.png"
-format="PNG" align="center" xml:id="selectMouse-im1"></imagedata>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Se você não está feliz com a forma como o mouse responde, você pode
 selecionar um diferente aqui.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Geralmente, <guilabel>Universal</guilabel> - Qualquer <guilabel>mouse PS/2
-ou USB</guilabel> é uma boa escolha.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Selecione <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel>
-para configurar os botões que não funcionam em um mouse com seis ou mais
-botões.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/pt_BR/setupBootloader.xml b/docs/docs/stable/installer/pt_BR/setupBootloader.xml
index ae4aa1b8..b8d66004 100644
--- a/docs/docs/stable/installer/pt_BR/setupBootloader.xml
+++ b/docs/docs/stable/installer/pt_BR/setupBootloader.xml
@@ -1,157 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="pt_BR" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="pt_BR" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Principais Opções do Gerenciador de Inicialização</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Interface do Bootloader</title>
-    <para>Por padrão, o Mageia usa exclusivamente:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (com ou sem menu gráfico) para um sistema Legacy/MBR ou Legacy/GPT</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi para sistema UEFI.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>O menu gráfico da Mageia é ótimo :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 para sistemas Legacy/MBR e Legacy/GPT.</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Não modifique o <emphasis role="bold">dispositivo de
-inicialização(boot)</emphasis>, a menos que você realmente saiba o que está
-fazendo.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi em sistemas UEFI.</title>
-      <para>Com um sistema UEFI, a interface do usuário é um pouco diferente, pois você
-não pode escolher entre as opções de "<emphasis role="bold">com</emphasis>
-ou<emphasis role="bold">sem</emphasis>" menu gráfico.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>Se a Mageia for o único sistema instalado em seu computador, o instalador
-criou um ESP (EFI System Partition) para hospedar o "bootloader"
-(GRUB2-efi). Se já houver sistemas operacionais UEFI instalados em seu
-computador (Windows 8, por exemplo), o instalador Mageia detectará o ESP
-existente, criado pelo Windows, e adicionará o GRUB2-efi. Embora seja
-possível ter vários ESPs, apenas um é necessário (e aconselhado), qualquer
-que seja o número de sistemas operacionais que você possui.</para>
-      <para>Não modifique o <emphasis role="bold">dispositivo de
-inicialização(boot)</emphasis>, a menos que você realmente saiba o que está
-fazendo.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Usando o Gerenciador de Inicialização da Mageia</title>
-    <para>Por padrão, e de acordo com seu sistema, a Mageia grava um dos seguintes:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>um "bootloader" (setor de início) GRUB2 no MBR (Master Boot Record) do seu
-primeiro disco rígido ou na partição de inicialização do BIOS.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>um GRUB2-efi "bootloader" (setor de início) no ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>Se você já tem outros sistemas operacionais instalados, a Mageia tenta
-adicioná-los ao seu novo menu de inicialização da Mageia. Se você não quiser
-esse comportamento, clique em <guibutton>Avançar</guibutton> e, em seguida,
-desmarque a opção <emphasis role="bold">Probe Foreign OS</emphasis> (testar
-outros sistemas).</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Usando um Gerenciador de Inicialização existente</title>
-    <para>O procedimento exato para adicionar seu sistema Mageia, a um gerenciador de
-inicialização existente, está além do escopo desta documentação. No entanto,
-na maioria dos casos, ele envolverá a execução do programa de instalação do
-carregador de inicialização relevante, que deve detectá-lo e adicioná-lo
-automaticamente. Consulte a documentação do sistema operacional em questão.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Usando o carregamento de corrente</title>
-    <para>Se você não quiser uma Mageia inicializável, mas carregá-la de outro SO,
-clique em <guibutton>Avançar</guibutton>, depois em
-<guibutton>Avançado</guibutton> e marque a caixa <guilabel>Não toque em ESP
-ou MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para><guilabel>Segurança</guilabel>: Permite-lhe definir uma palavra-passe para o
-gestor de arranque. Isso significa que outras pessoas não podem entrar no
-modo de usuário único ou alterar as configurações no momento da
-inicialização.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
   </section>
   <section>
-    <title>Opções</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>Primeira pagina</title>
-      <para><itemizedlist><listitem><para><guilabel>Atraso antes de inicializar a imagem padrão</guilabel>: Isso
-permite que você defina um tempo de espera, em segundos, antes que o sistema
-operacional padrão seja iniciado.</para></listitem><listitem><para><guilabel>Segurança</guilabel>: Permite que você defina uma senha para o
-gerenciador de inicialização. Isso significa que um nome de usuário e senha
-serão necessários ao inicializar para selecionar uma entrada de
-inicialização ou alterar as configurações. O nome de usuário é <emphasis
-role="bold">root</emphasis> e a senha é a escolhida posteriormente aqui.</para></listitem><listitem><para><guilabel>Senha</guilabel>: Escolha uma senha para o bootloader.</para></listitem><listitem><para><guilabel>Senha (novamente)</guilabel>: Redigite a senha e o DrakX
-verificará se combina com a senha acima.</para></listitem><listitem><para><guilabel>Avançado</guilabel></para><itemizedlist><listitem><para><guilabel>Ativar ACPI</guilabel>: ACPI (Configuração Avançada e Interface de
-Energia) é um padrão para gerenciamento de energia. Pode poupar energia,
-parando os dispositivos não utilizados. A desmarcação pode ser útil se, por
-exemplo, seu computador não suportar a ACPI ou se você achar que a
-implementação da ACPI pode causar alguns problemas (por exemplo,
-reinicializações aleatórias ou travamentos do sistema).</para></listitem><listitem><para><guilabel>Ativar SMP</guilabel>: Esta opção ativa / desativa o
-multiprocessamento simétrico para processadores com vários núcleos.</para></listitem><listitem><para><guilabel>Ativar APIC</guilabel>: Isso permite que o sistema operacional
-acesse o "Controlador Avançado de Interrupções Programáveis". Os
-dispositivos APIC permitem modelos de prioridade mais complexos e
-gerenciamento avançado de IRQ (solicitação de interrupção).</para></listitem><listitem><para><guilabel>Ativar APIC local</guilabel>: o APIC local gerencia todas as
-interrupções externas de um processador específico em um sistema SMP.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Principais Opções do Gerenciador de Inicialização</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Próxima Pagina</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Padrão:</guilabel> Sistema operacional iniciado por padrão</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Anexar:</guilabel> Esta opção permite que você transmita as
-informações do kernel ou informe o kernel para fornecer mais informações à
-medida que inicia.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Probe OS estrangeiros</guilabel>: veja acima <link linkend =
-"setupMageiaBootloader"> Usando um gerenciador de boot Mageia </link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Avançado</guilabel><itemizedlist><listitem><para><guilabel>Modo de vídeo</guilabel>: define o tamanho da tela e a
-profundidade de cor a ser usada pelo menu de inicialização. Se você clicar
-no "triângulo para baixo", você terá outras opções de tamanho e profundidade
-de cor.</para></listitem><listitem><para><emphasis role = "bold"> Não toque em ESP ou MBR </emphasis>: veja acima
-<link linkend = "setupChainLoading"> Usando o carregamento de corrente
-</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Usando um Gerenciador de Inicialização existente</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Adicionando ou Modificando uma Entrada do Menu de Inicialização</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/setupSCSI.xml b/docs/docs/stable/installer/pt_BR/setupSCSI.xml
index 52a4ae8a..02a8da20 100644
--- a/docs/docs/stable/installer/pt_BR/setupSCSI.xml
+++ b/docs/docs/stable/installer/pt_BR/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="pt_BR">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Detecção de disco rígido</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,16 +37,17 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">O "DrakX", normalmente, detectará os discos rígidos corretamente. No
 entanto, com alguns controladores SCSI mais antigos, pode não ser possível
 determinar os drivers corretos a serem usados e subsequentemente não
 reconhecer a unidade.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">Se isso acontecer, você precisará informar manualmente ao DrakX quais
-unidade(s) SCSI você possui.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">O DrakX deve então ser capaz de configurar o dispositivo(s) corretamente.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/software.xml b/docs/docs/stable/installer/pt_BR/software.xml
new file mode 100644
index 00000000..43d220e8
--- /dev/null
+++ b/docs/docs/stable/installer/pt_BR/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="pt_BR" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/pt_BR/soundConfig.xml b/docs/docs/stable/installer/pt_BR/soundConfig.xml
index cc0a08a7..00691f98 100644
--- a/docs/docs/stable/installer/pt_BR/soundConfig.xml
+++ b/docs/docs/stable/installer/pt_BR/soundConfig.xml
@@ -1,42 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="pt_BR">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Configuração de Som</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Nessa tela, é fornecido o nome do driver que o instalador escolheu para sua
-placa de som, que será o driver padrão, se houver.</para>
+  
 
-  <para>O driver padrão deve funcionar sem problemas. No entanto, se após a
-instalação você encontrar problemas, em seguida, executar
-<command>draksound</command> ou iniciar esta ferramenta via CCM (Centro de
-Configuração Mageia), escolhendo o <guilabel> Hardware</guilabel> e clicar
-em <guilabel>configuração de Som</guilabel> no canto superior direito da
-tela.</para>
+  
 
-  <para>Em seguida, na tela <emphasis role="bold">Draksound</emphasis> ou na
-ferramenta <emphasis role="bold">Sound Configuration</emphasis>
-(configuração do som), clique em <guibutton>Troubleshooting</guibutton>
-(problemas) para encontrar conselhos úteis sobre como resolver o problema.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Avançado</title>
     </info>
 
-    <para>Clicar em <emphasis role="bold"><guibutton>Avançado</guibutton></emphasis>
-nesta tela, durante a instalação, é útil se não houver um "driver" padrão e,
-havendo vários "drivers" disponíveis, você acha que o instalador selecionou
-um incorretamente.</para>
-
-    <para>Nesse caso, você pode selecionar um driver diferente depois de clicar em
-<emphasis role="bold"><guibutton>Deixe-me escolher qualquer
-driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/takeOverHdConfirm.xml b/docs/docs/stable/installer/pt_BR/takeOverHdConfirm.xml
index cee785f9..9fa2670d 100644
--- a/docs/docs/stable/installer/pt_BR/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/pt_BR/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="pt_BR">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Confirme o disco rígido para ser formatado</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,16 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
-
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Clique em <guibutton>Anterior</guibutton> se você não tiver certeza da sua
-escolha.</para>
-
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Clique em <guibutton>Avançar</guibutton> para continuar, se tiver certeza de
-que você quer <emphasis role='bold'>apagar</emphasis> todas as partições,
-todos os sistemas operacionais e todos os dados que possam estar no disco
-rígido.</para>
-</section>
\ No newline at end of file
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
+choice.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/testing.xml b/docs/docs/stable/installer/pt_BR/testing.xml
index 1f1ec789..ae0725ee 100644
--- a/docs/docs/stable/installer/pt_BR/testing.xml
+++ b/docs/docs/stable/installer/pt_BR/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Teste Mageia com o sistema Live</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Teste Mageia com o sistema Live</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,21 +17,20 @@
       <title xml:id="testing1-ti1">Modo Live</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>Se você selecionou esta tela "Boot Mageia". Se não, você começa o passo da "
-<link linkend="doPartitionDisks">Etapa de particionamento</link>"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Hardware de teste</title>
       </info>
 
-      <para>Um dos objetivos do modo Live é testar se o hardware é gerenciado
-corretamente pelo Mageia. Você pode verificar se todos os dispositivos tem
-um driver na seção Hardware do centro de Controlo Mageia. Você pode testar
-os dispositivos mais atuais:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -36,11 +38,7 @@ os dispositivos mais atuais:</para>
         </listitem>
 
         <listitem>
-          <para>placa gráfica: se você viu a tela anterior, ela já está OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webcam:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -48,7 +46,7 @@ os dispositivos mais atuais:</para>
         </listitem>
 
         <listitem>
-          <para>impressora: configurar e imprimir uma página de teste</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -56,10 +54,13 @@ os dispositivos mais atuais:</para>
         </listitem>
       </itemizedlist>
 
-      <para>Se tudo estiver OK, você pode processar para a instalação. Se não, você pode
-sair com a opção parar.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>As definições de configuração que você fez aqui são mantidos na instalação.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -67,14 +68,14 @@ sair com a opção parar.</para>
         <title xml:id="testing3-ti1">Iniciar a instalação</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>Para iniciar a instalação do Mageia LiveCD ou DVD Live para o disco rígido
-ou unidade SSD, basta clicar no ícone "Instalar no Disco Rígido". Você
-receberá esta tela, e em seguida as "<link linkend="doPartitionDisks">etapa
-de particionamento</link>", para a instalação direta.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/pt_BR/uninstall-Mageia.xml b/docs/docs/stable/installer/pt_BR/uninstall-Mageia.xml
index 67ca26b2..7800563e 100644
--- a/docs/docs/stable/installer/pt_BR/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/pt_BR/uninstall-Mageia.xml
@@ -1,33 +1,44 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="pt_BR">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="pt_BR" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Desinstalando o Mageia</title>
   </info>
 
   
 
+  
+
   <para>Se a Mageia não te convencer ou você não pode instalá-lo corretamente, ou
 seja, você quer se livrar dele, que é o seu direito, a Mageia também lhe dá
 a possibilidade de desinstalar. Isso não é verdade para todos os sistemas
 operacionais.</para>
 
-  <para>Após o backup de dados, reinicie o DVD de instalação da Mageia e selecione
-<emphasis role="bold">Recuperar o Sistema</emphasis>, em seguida, <emphasis
-role="bold">Restaurar o carregador de inicialização do
-Windows</emphasis>. Na próxima inicialização, você terá apenas o Windows,
-sem a opção de escolher o sistema operacional.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>No Windows, para recuperar o espaço usado pelas partições Mageia: clique em
-<code>Iniciar -> Painel de Controle -> Ferramentas Administrativas ->
-Gerenciamento do Computador -> Armazenamento -> Gerenciamento de
-Disco</code>. Você reconhecerá uma partição Mageia porque ela é rotulada
-como <guilabel>Desconhecida</guilabel> e também por seu tamanho e local no
-disco. Clique com o botão direito em cada uma dessas partições e selecione
-<guibutton>Excluir</guibutton> para liberar o espaço.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-  <para>Se você estiver usando o Windows XP, você pode criar uma nova partição e
-formatá-lo (FAT32 ou NTFS). Ele vai receber uma carta de partição.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>Se tiver o Windows Vista ou o 7, existe mais uma possibilidade: você pode
 estender a partição existente que está à esquerda do espaço
@@ -35,4 +46,4 @@ liberado. Existem outras ferramentas de particionamento que podem ser
 usadas, como o <emphasis>gparted</emphasis>, disponíveis para Windows e
 Linux. Como sempre, ao mudar de partições, tenha muito cuidado para fazer
 "backup" de algo importante para você.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/pt_BR/unused.xml b/docs/docs/stable/installer/pt_BR/unused.xml
index cc97c170..c6c194b1 100644
--- a/docs/docs/stable/installer/pt_BR/unused.xml
+++ b/docs/docs/stable/installer/pt_BR/unused.xml
@@ -1,28 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="pt_BR" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="pt_BR">
   <info>
     <title xml:id="unused-ti1">Manter ou apagar material não utilizado</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
 
-  <para>Nesta etapa, o instalador procura os pacotes de localidades não utilizadas e
-os pacotes de hardware não utilizados. Em seguida, propõe-lhe para
-eliminá-los. É recomendável aceitar, exceto se você preparar uma instalação
-que tem de ser executado em hardware diferente.</para>
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>O próximo passo é a cópia de arquivos no disco rígido. Isso leva alguns
-minutos. No final, você recebe uma tela em branco por algum tempo, isso é
-normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/ro/DrakLive-cover.xml b/docs/docs/stable/installer/ro/DrakLive-cover.xml
index 06ddedb3..61a0426a 100644
--- a/docs/docs/stable/installer/ro/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/ro/DrakLive-cover.xml
@@ -1,77 +1,105 @@
-<?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="ro" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="ro" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Instalare de pe mediul LIVE</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Ianuarie 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Instalare de pe mediul LIVE</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Documentația oficială pentru Mageia</para>
+      <para role="tagline">Documentația oficială pentru Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Textele și capturile de ecran din acest manual sînt disponibile sub licența
+
+      <para>Textele și capturile de ecran din acest manual sînt disponibile sub licența
 CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-            </para>
-            <para>Acest manual a fost produs cu ajutorul <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Acest manual a fost produs cu ajutorul <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> dezvoltat de <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-            </para>
-            <para>A fost scris de voluntari în timpul lor liber. Dacă doriți să ajutați la
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>A fost scris de voluntari în timpul lor liber. Dacă doriți să ajutați la
 îmbunătățirea acestui manual, vă rugăm să contactați <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">echipa de
-documentație</link>.</para> 
+documentație</link>.</para>
     </cover>
   </info>
+
   <article>
     <title>Instalare de pe mediul LIVE</title>
-       <para><note>
-          <para>Ecranele care urmează să le vedeți pe parcursul instalării sînt în funcție
+
+    <para><note>
+        <para>Ecranele care urmează să le vedeți pe parcursul instalării sînt în funcție
 de componentele voastre materiale și de alegerile făcute în timpul
 instalării.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/ro/DrakLive.xml b/docs/docs/stable/installer/ro/DrakLive.xml
index 76327e2b..1aaaedcd 100644
--- a/docs/docs/stable/installer/ro/DrakLive.xml
+++ b/docs/docs/stable/installer/ro/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="ro" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="ro" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Instalare de pe mediul LIVE</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Instalare de pe mediul LIVE</title>
 
     <cover>
       <para><note>
@@ -17,10 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> dezvoltat de <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>A fost scris de voluntari în timpul lor liber. Dacă doriți să ajutați la
-îmbunătățirea acestui manual, vă rugăm să contactați <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">echipa de
-documentație</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>
 
@@ -40,7 +54,12 @@ documentație</link>.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -50,17 +69,18 @@ documentație</link>.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/ro/DrakX-cover.xml b/docs/docs/stable/installer/ro/DrakX-cover.xml
index e6c8f079..96137a9a 100644
--- a/docs/docs/stable/installer/ro/DrakX-cover.xml
+++ b/docs/docs/stable/installer/ro/DrakX-cover.xml
@@ -1,116 +1,155 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="ro" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="ro" xml:id="Quick-Startup"
+      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>Instalare cu DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Februarie 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Februarie 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Documentația oficială pentru Mageia</para>
+      <para role="tagline">Documentația oficială pentru Mageia</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>Textele și capturile de ecran din acest manual sînt disponibile sub licența
+
+      <para>Textele și capturile de ecran din acest manual sînt disponibile sub licența
 CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Acest manual a fost produs cu ajutorul <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Acest manual a fost produs cu ajutorul <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> dezvoltat de <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>A fost scris de voluntari în timpul lor liber. Dacă doriți să ajutați la
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>A fost scris de voluntari în timpul lor liber. Dacă doriți să ajutați la
 îmbunătățirea acestui manual, vă rugăm să contactați <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">echipa de
-documentație</link>.</para> 
+documentație</link>.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Instalare cu DrakX</title>
-       <para><note>
-          <para>Ecranele care urmează să le vedeți pe parcursul instalării sînt în funcție
+
+    <para><note>
+        <para>Ecranele care urmează să le vedeți pe parcursul instalării sînt în funcție
 de componentele voastre materiale și de alegerile făcute în timpul
 instalării.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -118,29 +157,32 @@ instalării.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/ro/DrakX-inline.xml b/docs/docs/stable/installer/ro/DrakX-inline.xml
new file mode 100644
index 00000000..fd1ce4d2
--- /dev/null
+++ b/docs/docs/stable/installer/ro/DrakX-inline.xml
@@ -0,0 +1,139 @@
+<?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="ro" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Instalare cu DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>Ecranele care urmează să le vedeți pe parcursul instalării sînt în funcție
+de componentele voastre materiale și de alegerile făcute în timpul
+instalării.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Textele și capturile de ecran din acest manual sînt disponibile sub licența
+CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Acest manual a fost produs cu ajutorul <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> dezvoltat de <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>A fost scris de voluntari în timpul lor liber. Dacă doriți să ajutați la
+îmbunătățirea acestui manual, vă rugăm să contactați <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">echipa de
+documentație</link>.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/DrakX.xml b/docs/docs/stable/installer/ro/DrakX.xml
index 26c36375..36578a50 100644
--- a/docs/docs/stable/installer/ro/DrakX.xml
+++ b/docs/docs/stable/installer/ro/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="ro" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="ro" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Instalare cu DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Instalare cu DrakX</title>
 
     <cover>
       <para><note>
@@ -35,18 +73,6 @@ documentație</link>.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -61,23 +87,28 @@ documentație</link>.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -87,7 +118,10 @@ documentație</link>.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -95,19 +129,25 @@ documentație</link>.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -115,11 +155,15 @@ documentație</link>.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -138,4 +182,4 @@ documentație</link>.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/ro/SelectAndUseISOs2.xml b/docs/docs/stable/installer/ro/SelectAndUseISOs2.xml
index e7e193c2..00aaa4d1 100644
--- a/docs/docs/stable/installer/ro/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/ro/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="ro" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Selectați și utilizați imaginile ISO</title>
   </info>
   <section>
     <title>Introducere</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
-    <para>There are two families of media:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: Booting with this media provides you with the maximum
-flexibility when choosing what to install, and for configuring your
-system. In particular, you have a choice of which Desktop environment to
-install</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: This option allows you to try out Mageia without having to
-actually install it, or make any changes to your computer.  If the
-installation is decided, the process is simpler, but you get fewer choices
-than offered by the Classical installer</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Detaliile sînt oferite în secțiunile următoare.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Medii</title>
     <section>
       <title>Definiție</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support (DVD, USB
-stick, ...) the ISO file is copied to.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
@@ -43,25 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>Caracteristici comune</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the Classical installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
             <para>They are used for performing clean installs or to upgrade a previously
-installed version of Mageia.</para>
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Unele unelte sînt disponibile în ecranul de întîmpinare: Recuperare sistem,
-Test de memorie, Unealta de detecție materială</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Fiecare DVD conține multe medii de birou și limbi disponibile.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Vi-se va oferi posibilitatea în timpul instalării să adăugați aplicațiile
-proprietare.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -73,21 +107,19 @@ proprietare.</para>
         <itemizedlist>
           <listitem>
             <para>Can be used to preview the Mageia operating system without having to install
-it. Can also be used to install Mageia if you wish.</para>
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade previously installed Mageia
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Acestea conțin aplicații proprietare.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -95,13 +127,13 @@ releases.</emphasis></para>
         <title>Live DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Plasma desktop environment only.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -109,13 +141,13 @@ releases.</emphasis></para>
         <title>LiveDVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>Doar mediul de birou GNOME.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -123,13 +155,13 @@ releases.</emphasis></para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Xfce desktop environment only.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 or 64 bit architectures.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -140,22 +172,10 @@ releases.</emphasis></para>
         <title>Caracteristici comune</title>
         <itemizedlist>
           <listitem>
-            <para>These are minimal ISO's containing no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient if
-bandwidth is too low to download a full DVD, or if you have a PC without a
-DVD drive or is unable to boot from a USB stick.</para>
-          </listitem>
-          <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>First steps are English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -163,8 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -172,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Conține aplicații proprietare (în mare parte piloți, codecuri...) pentru
-persoanele care au nevoie de ele.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -185,16 +204,23 @@ persoanele care au nevoie de ele.</para>
       <title>Descărcare</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, you are provided with some information, such as
-the mirror in use and an option to switch if the bandwidth is too low. If
-http is chosen, you will also see something regarding checksums.</para>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the
-other, and copy the checksum <link linkend="integrity">for later
-use</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
@@ -202,52 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
 algorithm from the file to be downloaded. You may compare the checksum of
 your downloaded ISO against that of the original source ISO. If the
 checksums do not match, it means that the actual data on the ISO's do not
-match, and if it is the case, then you should retry the download or attempt
-a repair using BitTorrent.</para>
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>To generate the checksum for your downloaded ISO, open a console, (no need
 to be root), and:</para>
       <itemizedlist>
         <listitem>
-          <para>To use md5sum, type: <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>To use sha1sum, type: <userinput>sha1sum
-path/to/the/image/file.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Example:</para>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Inscripționați sau copiați imaginea ISO</title>
-    <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
-stick. This is not a standard copy operation as a bootable medium will
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
 actually be created.</para>
     <section>
       <title>Inscripționarea imaginii ISO pe un CD/DVD</title>
-      <para>Whichever software you use, ensure that the option to burn an <emphasis
-role="bold">image</emphasis> is used, burn <emphasis
-role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not
-correct. See <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link> for more information.</para>
     </section>
     <section>
       <title>Puneți imaginea ISO pe o cheie USB</title>
-      <para>Toate imaginile ISO Mageia sînt hibride, asta înseamnă că pot fi „puse” pe o
-cheie USB pentru a demara și instala sistemul.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any existing data will be lost and the partition capacity will
-be reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>Pentru a recupera capacitatea inițială va trebui să repartiționați și să
-reformatați cheia USB.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Utilizînd o unealtă grafică din Mageia</title>
         <para>Puteți utiliza un utilitar grafic precum <link
@@ -259,7 +296,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <itemizedlist>
           <listitem>
             <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -268,7 +305,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Utilizînd linia de comandă dintr-un sistem GNU/Linux</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk overwriting
 potentially valuable existing data if you specify the wrong target device.</para>
@@ -278,27 +315,27 @@ potentially valuable existing data if you specify the wrong target device.</para
             <para>Deschideți o consolă</para>
           </listitem>
           <listitem>
-            <para>Become a root (Administrator) user with the command <userinput>su
--</userinput> (don't forget the final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Conectați cheia USB (nu o montați, adică nu deschideți nicio aplicație sau
-gestionar de fișiere pentru a o citi)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Introduceți comanda <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
             <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
             <para>Alternatively, you can find the device name with the command
-<code>dmesg</code>: towards the end of this example, you can see the device
-name starting with <emphasis>sd</emphasis>, and in this case,
-<emphasis>sdd</emphasis> is the actual device. You can also see that its
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
 size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
@@ -320,21 +357,22 @@ size is 2GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: <emphasis role="bold"># <userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Where X=your device name eg: /dev/sdd</para>
-            <para>Example:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-and <emphasis role="bold">of</emphasis> stands for <emphasis
-role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Introduceți comanda: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>This is the end of the process, and you may now unplug your USB stick.</para>
@@ -343,4 +381,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/acceptLicense.xml b/docs/docs/stable/installer/ro/acceptLicense.xml
index 531964e3..53dc96bc 100644
--- a/docs/docs/stable/installer/ro/acceptLicense.xml
+++ b/docs/docs/stable/installer/ro/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Licența și Notele ediției</title>
   </info>
 
@@ -46,18 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">Contract de licență</title>
     </info>
 
-    <para>Înainte să instalați <application>Mageia</application>, vă rugăm să citiți
-cu atenție contractul de licență.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Contractul de licență se aplică întregii distribuții
-<application>Mageia</application> și trebuie acceptat înainte de a continua.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>To proceed, simply select <guilabel>Accept</guilabel> and then click on
-<guibutton>Next</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Dacă ați decis să nu-l acceptați, atunci vă mulțumim că ați aruncat o
-privire. Apăsați pe <guibutton>Terminare</guibutton> și calculatorul va
-reporni.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -75,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Important information about this release of
-<application>Mageia</application> can be viewed by clicking on the
-<guibutton>Release Notes</guibutton> button.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/addUser.xml b/docs/docs/stable/installer/ro/addUser.xml
index 0a3849cb..e3a2cfa4 100644
--- a/docs/docs/stable/installer/ro/addUser.xml
+++ b/docs/docs/stable/installer/ro/addUser.xml
@@ -1,32 +1,51 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ro" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Gestionare utilizatori și administratori</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Definiți parola administratorului (root):</title>
     </info>
 
-    <para>It is advisable for all <application>Mageia</application> installations to
-set a <emphasis role="bold">superuser</emphasis> (administrator) password,
-usually called the <emphasis>root password</emphasis> in Linux. As you type
-a password into the top box a shield will change from red to yellow to green
-depending on the strength of the password. A green shield shows you are
-using a strong password. You need to repeat the same password in the box
-underneath, to check that the first entry was not mistyped.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>All passwords are case sensitive. It is best to use a mixture of letters
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
 (upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
@@ -36,43 +55,46 @@ underneath, to check that the first entry was not mistyped.</para>
       <title xml:id="enterUser-ti3">Introduceți un utilizator</title>
     </info>
 
-    <para>Add a user here. A regular user has fewer privileges than the <emphasis
-role="bold">superuser</emphasis> (root), but enough to use the internet,
-office applications or play games and anything else the average user might
-use their computer for.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Pictogramă</guibutton>: dacă apăsați acest buton va schimba
-pictograma utilizatorului.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Nume real</guilabel>: introduceți aici numele real al
-utilizatorului.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use
-a version of the user's real name. <emphasis role="bold">The login name is
-case sensitive.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password</guilabel>: Type in the user password. There is a shield
-at the end of the text box that indicates the strength of the password. (See
-also <xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password (again)</guilabel>: Retype the user password DrakX will
-check that you have not mistyped the password.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Any users you added while installing Mageia, will have a home directory that
-is both read and write protected (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
@@ -82,32 +104,31 @@ management</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Gestionare avansată utilizatori</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>The <guibutton>Advanced</guibutton> option allows you to edit further
-settings for the user you are adding.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
-<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis>
-and <emphasis role="bold">Sh</emphasis></para>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the <emphasis
-role="bold">user ID</emphasis> for any user you added in the previous
-screen. If you are unsure what the purpose of this is, then leave it blank.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ro/add_supplemental_media.xml b/docs/docs/stable/installer/ro/add_supplemental_media.xml
index 9a9b882f..f55d050f 100644
--- a/docs/docs/stable/installer/ro/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/ro/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="ro">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Selectare medii (configurați mediile de instalare suplimentare)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,43 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>This screen shows you the list of already recognized repositories. You can
-add other sources for packages, like an optical disc or a remote source.
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
 The source selection determines which packages will be available during the
-next steps.</para>
+subsequent steps.</para>
 
   <para>Pentru o sursă de rețea trebuiesc urmate două etape:</para>
 
   <orderedlist>
     <listitem>
-      <para>Alegerea și activarea rețelei, dacă nu este deja activată.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
       <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
 mirror, you have access to the selection of all repositories managed by
-Mageia, like the <emphasis role="bold">Nonfree</emphasis>, the <emphasis
-role="bold">Tainted</emphasis> repositories and the <emphasis
-role="bold">Updates</emphasis>. With the URL, you can designate a specific
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
 repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>If you are updating a 64 bit installation which may contain some 32 bit
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
 packages, it is advised to use this screen to add an online mirror by
-ticking one of the Network protocols here. The 64-bit DVD ISO only contains
-64-bit and noarch packages, it will not be able to update the 32-bit
-packages. However, after adding an online mirror, the installer will find
-the needed 32-bit packages there.</para>
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/ask_mntpoint_s.xml b/docs/docs/stable/installer/ro/ask_mntpoint_s.xml
index ac1f6120..9049a0c4 100644
--- a/docs/docs/stable/installer/ro/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/ro/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="ro">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Alegeți punctele de montare</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Aici puteți vedea partițiile Linux care au fost găsite pe acest
-calculator. Dacă nu sînteți de acord cu sugestiile făcute de
-<application>DrakX</application>, puteți modifica punctele de montare.</para>
-
-  <note>
-    <para>If you change anything, make sure you still have a <emphasis
-role="bold"><literal>/</literal></emphasis> (root) partition.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis
-role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
-name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis>
-(for example, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>If you have several partitions, you can choose various different mount
-points from the drop down menu, such as <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis
-role="bold">/var</emphasis>. You can even make your own mount points, for
-instance <emphasis role="bold"><literal>/video</literal></emphasis> for a
-partition where you want to store your films, or <emphasis
-role="bold">/Data</emphasis> (or some other name) for your data.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -79,13 +82,17 @@ mount point field blank.</para>
   </itemizedlist>
 
   <warning>
-    <para>If you are not sure what to choose, click <emphasis
-role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
-disk partitioning</guilabel>, where, you can click on a partition to see its
-type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Dacă nu sînteți sigur că punctele de montare sînt corecte, apăsați pe
-<guibutton>Înainte</guibutton> și alegeți între a formata numai partițiile
-sugerate de DrakX sau mai multe.</para>
-</section>
\ No newline at end of file
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/ro/bestTime.xml b/docs/docs/stable/installer/ro/bestTime.xml
index f895787c..a30098d8 100644
--- a/docs/docs/stable/installer/ro/bestTime.xml
+++ b/docs/docs/stable/installer/ro/bestTime.xml
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ro" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ro" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Parametri de dată și oră</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>La această etapă trebuie să selectați pe ce sistem de timp va fi definit
-ceasul intern, pe ora locală sau pe UTC.</para>
-
-  <para>În tabul avansate veți găsi mai multe opțiuni pentru parametrarea datei și
-orei</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/bootLive.xml b/docs/docs/stable/installer/ro/bootLive.xml
index e81cd442..44c83ffb 100644
--- a/docs/docs/stable/installer/ro/bootLive.xml
+++ b/docs/docs/stable/installer/ro/bootLive.xml
@@ -1,30 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="ro"><info><title xml:id="bootLive-ti1">Demarează Mageia ca un sistem Live</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Se demarează de pe mediu</title></info><section><info><title xml:id="bootLive11-ti1">De pe un disc</title></info><para>Puteți demara direct de pe mediul utilizat la scrierea imaginii
-(DVD-Rom...). În mod normal trebuie doar să introduceți discul în unitatea
-de DVD ca încărcătorul de sistem să lanseze instalarea în mod automat după
-ce reporniți calculatorul. Dacă nu se întîmplă așa, trebuie să reconfigurați
-BIOS-ul sau să apăsați o tastă care să vă ofere posibilitatea de a alege
-perifericul de pe care va demara calculatorul.</para><para>În funcție de componentele materiale pe care le aveți și de cum sînt
-configurate acestea, veți obține unul din cele două ecrane de mai jos.</para></section><section><info><title xml:id="bootLive12-ti1">De pe un dispozitiv USB</title></info><para>Puteți demara de pe dispozitivul USB pe care ați scris imaginea ISO. În
-funcție de parametrii din BIOS, calculatorul s-ar putea să demareze direct
-de pe dispozitivul USB deja conectat la un port. Dacă nu se întîmplă așa,
-trebuie să reconfigurați BIOS-ul sau să apăsați o tastă care să vă ofere
-posibilitatea de a alege perifericul de pe care va demara calculatorul.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">În mod BIOS/CSM/Legacy</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Primul ecran la demararea în mod BIOS</para></caption></mediaobject><para>În meniul din mijloc puteți alege dintre trei opțiuni:</para><itemizedlist><listitem><para>Demarează Mageia: În acest fel Mageia va demara de pe mediul conectat (DVD
-sau cheie USB) fără a scrie nimic pe disc, prin urmare așteptați-vă la un
-sistem lent. De îndată de demararea s-a terminat, veți putea proceda la
-instalarea sistemului pe discul dur.</para></listitem><listitem><para>Instalează Mageia: Această opțiune va instala Mageia direct pe discul dur.</para></listitem><listitem><para>Demarează de pe discul dur: Această alegere vă permite să demarați direct de
-pe discul dur, ca de obicei, cînd nu este conectat niciun mediu (DVD sau
-cheie USB). (Remarcă: nu funcționează cu Mageia 5)</para></listitem></itemizedlist><para>În meniul de demaraj aveți opțiunile:</para><itemizedlist><listitem><para>F1 - Ajutor. Explică opțiunile „splash”, „apm”, „acpi” și „lde”</para></listitem><listitem><para>F2 - Limba. Alegeți limba afișată pe ecranele de instalare.</para></listitem><listitem><para>F3 - Rezoluția ecranului. Alegeți între mod text sau grafic la 640x400,
-800x600, 1024x728</para></listitem><listitem><para>F4 - DVD-Rom. DVD-Rom sau alte surse. În mod normal instalarea este
-performată de pe mediul inserat. Puteți selecta aici alte surse precum
-servere FTP sau NFS. Dacă instalarea este efectuată prin rețea cu un server
-SLP, selectați una din sursele de instalare disponibile pe serverul cu
-această opțiune.</para></listitem><listitem><para>F5 - Pilot. Da sau Nu. Sistemul este conștient de prezența unui disc cu un
-pilot actualizat și va cere să-l inserați în cursul procesului de instalare.</para></listitem><listitem><para>F6 - Opțiuni de nucleu. Acesta este un mod de a specifica opțiuni în funcție
-de componentele materiale pe care le aveți și de piloții pe care îi
-utilizați.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">În mod UEFI</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Primul ecran la demararea de pe disc cu un sistem UEFI</para></caption></mediaobject><para>Aveți numai opțiunea de a lansa Mageia în modul Live (prima opțiune) sau să
-procedați la instalare (a doua opțiune).</para><para>Dacă demarați de pe un dispozitiv USB, veți obține două linii suplimentare
-care sînt duplicatele celor de dinaintea lor dar cu sufixul „USB”. Va trebui
-să le alegeți.</para><para>În fiecare din cazuri, primele etape vor fi la fel, să alegeți limba, fusul
-orar și dispunerea tastaturii, apoi procesul diferă prin <link
-linkend="testing">etapele adiționale în modul Live</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Demarează Mageia ca un sistem Live</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Se demarează de pe mediu</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">În mod BIOS/CSM/Legacy</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Primul ecran la demararea în mod BIOS</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">În mod UEFI</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/ro/chooseDesktop.xml b/docs/docs/stable/installer/ro/chooseDesktop.xml
index e8767a6b..812ea2ee 100644
--- a/docs/docs/stable/installer/ro/chooseDesktop.xml
+++ b/docs/docs/stable/installer/ro/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ro" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Selectarea biroului</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Selectarea biroului</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide-show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> or <application>GNOME</application>
-desktop environment. Both come with a full set of useful applications and
-tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
-use both), or if you want to modify the default software choices for these
-desktop environments. The <application>LXDE</application> desktop, for
-instance, is lighter than the previous two, sporting less eye candy and
-fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/ro/choosePackageGroups.xml b/docs/docs/stable/installer/ro/choosePackageGroups.xml
index a905c397..4209ea49 100644
--- a/docs/docs/stable/installer/ro/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/ro/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ro" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ro" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Selectarea grupurilor de pachete</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/ro/choosePackagesTree.xml b/docs/docs/stable/installer/ro/choosePackagesTree.xml
index e2a71a4b..73856956 100644
--- a/docs/docs/stable/installer/ro/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/ro/choosePackagesTree.xml
@@ -1,21 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="ro">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="ro">
   <info>
     <title xml:id="choosePackagesTree-ti1">Selectare individuală a pachetelor</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-  <para>După ce ați terminat selecția, puteți face clic pe <guibutton>pictograma cu
-dischetă</guibutton> din josul paginii pentru a salva lista cu pachetele
-alese (o puteți salva și pe o cheie USB). Puteți apoi utiliza această listă
-pentru a instala aceleași pachete pe un alt sistem, făcînd clic pe același
-buton și alegeți să o încărcați.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/configureServices.xml b/docs/docs/stable/installer/ro/configureServices.xml
index 044bb886..46200418 100644
--- a/docs/docs/stable/installer/ro/configureServices.xml
+++ b/docs/docs/stable/installer/ro/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ro" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="ro" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Configurați serviciile</title>
   </info>
@@ -7,20 +7,31 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose are usually good.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">Dacă evidențiați un serviciu, informații despre acesta vor fi afișate în
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Dacă evidențiați un serviciu, informații despre acesta vor fi afișate în
 infobula de dedesubt.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Faceți modificări numai în cazul în care știți foarte bine ceea ce faceți.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/configureTimezoneUTC.xml b/docs/docs/stable/installer/ro/configureTimezoneUTC.xml
index 66a2234d..944cae02 100644
--- a/docs/docs/stable/installer/ro/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/ro/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="ro">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="ro">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Configurați fusul orar</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the
-same time-zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
 or to GMT, also known as UTC.</para>
diff --git a/docs/docs/stable/installer/ro/configureX_card_list.xml b/docs/docs/stable/installer/ro/configureX_card_list.xml
index f4ba4884..ce931f07 100644
--- a/docs/docs/stable/installer/ro/configureX_card_list.xml
+++ b/docs/docs/stable/installer/ro/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="ro">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Alegeți un server X (configurați placa grafică)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX are o bază de date foarte cuprinzătoare de plăci grafice și va
 identifica, în general, corect placa grafică. </para>
@@ -29,33 +42,34 @@ identifica, în general, corect placa grafică. </para>
   <para>Dacă instalatorul nu a detectat corect placa grafică și știți ce model
 aveți, o puteți alege din arborescență: <itemizedlist>
       <listitem>
-        <para>fabricant</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>api numele plăcii</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>și tipul plăcii</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-<emphasis role="bold">Xorg</emphasis> category, which provides more than 40
-generic and open source video card drivers. If you still can't find a
-specific driver for your card there is the option of using the <emphasis
-role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the <emphasis role="bold">Command-line</emphasis> Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the <emphasis role="bold">Nonfree</emphasis>
-repository and in some cases only from the card manufacturers' websites.</para>
-
-  <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be
-explicitly enabled to access them. If you didn't enable it previously, you
-should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/ro/configureX_chooser.xml b/docs/docs/stable/installer/ro/configureX_chooser.xml
index eb8be5c0..e30b65d4 100644
--- a/docs/docs/stable/installer/ro/configureX_chooser.xml
+++ b/docs/docs/stable/installer/ro/configureX_chooser.xml
@@ -1,62 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="ro">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Configurare placă grafică și ecran</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym> or any other graphical environment to work well, the
-following <acronym>X</acronym> settings need to be correct. Choose the
-correct settings if none are shown, or if you think the details are
-incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Placă grafică</guibutton></emphasis>: alegeți placa
-grafică din listă dacă este necesar.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from
-the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose
-<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and
-vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Ratele de împrospătare incorecte pot distruge monitorul.</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and
-color depth of your monitor can be set here.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the option is there, and you test your
-settings, you should be ask whether your settings are correct. If you answer
-<emphasis role="bold">yes</emphasis>, the settings will be kept. If you
-don't see anything, you'll return to the configuration screen and be able to
-reconfigure everything until the test result is satisfactory. If the test
-option is not available, then make sure your settings are on the safe side.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Opțiuni</guibutton></emphasis>: aici puteți activa și
-dezactiva diverse opțiuni.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/ro/configureX_monitor.xml b/docs/docs/stable/installer/ro/configureX_monitor.xml
index e06b2595..7d895f1f 100644
--- a/docs/docs/stable/installer/ro/configureX_monitor.xml
+++ b/docs/docs/stable/installer/ro/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="ro">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,65 +23,83 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Alegeți monitorul</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX dispune de o bază de date cu monitoare foarte cuprinzătoare și în
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX dispune de o bază de date cu monitoare foarte cuprinzătoare și în
 general va identifica în mod corect monitorul.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
 could damage your monitor or video hardware. Please don't try something
 without knowing what you are doing.</emphasis> If in doubt you should
 consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Personalizat</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Personalizat</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Această opțiune vă permite să specificați doi parametri critici, rata de
-împrospătare verticală și rata orizontală de sincronizare. Rata de
-împrospătare verticală determină cît de des este împrospătat ecranul, iar
-rata orizontală de sincronizare este frecvența cu care sînt afișate liniile.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">Este <emphasis>FOARTE IMPORTANT</emphasis> ca specificațiile pe care le dați
+        <para revision="1" xml:id="configureX_monitor-pa4">Este <emphasis>FOARTE IMPORTANT</emphasis> ca specificațiile pe care le dați
 să nu fie peste capacitățile monitorului: puteți distruge monitorul. Dacă
 aveți dubii, alegeți o configurație conservativă și consultați documentația
 monitorului.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">Aceasta este opțiunea implicită și va încerca să determine tipul monitorului
-din baza de date cu monitoare.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Fabricant</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">Dacă instalatorul nu a detectat corect monitorul și îi cunoașteți
-referințele, atunci îl puteți alege din arborescență selecționîndu-l în
-ordine: <itemizedlist>
       <listitem>
-        <para>fabricant</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>numele fabricantului monitorului</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>descrierea monitorului</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Dacă instalatorul nu a detectat corect monitorul și îi cunoașteți
+referințele, atunci îl puteți alege din arborescență selecționîndu-l în
+ordine:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Generic</emphasis></para>
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the <emphasis
-role="bold">Vesa</emphasis> card driver when your video hardware cannot be
-determined automatically. Once again it may be wise to be conservative in
-your selections.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
+
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/ro/diskPartitioning.xml b/docs/docs/stable/installer/ro/diskPartitioning.xml
new file mode 100644
index 00000000..b3882473
--- /dev/null
+++ b/docs/docs/stable/installer/ro/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="ro" version="5.0" xml:lang="ro">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/diskdrake.xml b/docs/docs/stable/installer/ro/diskdrake.xml
index aabd0d5f..e7f1f7ab 100644
--- a/docs/docs/stable/installer/ro/diskdrake.xml
+++ b/docs/docs/stable/installer/ro/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ro" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Partiționare de disc personalizată cu DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis>
-partition you must ensure that you have a separate <emphasis
-role="bold">/boot</emphasis> partition. The encryption option for the
-<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise
-your system will be unbootable.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view their details before you start.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage
-device like a USB key). In the screen-shot above there are two available
-devices: <emphasis role="bold">sda </emphasis>and <emphasis
-role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if
-you are sure you want to wipe all partitions on the selected storage device.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Expert mode</guibutton> provides more options such as a label
-(give a name to) a partition, or to choose a partition type.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Apăsați pe <guibutton>Gata</guibutton> cînd sînteți pregătit.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
-Partition) is present and correctly mounted on /boot/EFI (see below)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/ro/doPartitionDisks.xml b/docs/docs/stable/installer/ro/doPartitionDisks.xml
index 49f75ca8..966bf821 100644
--- a/docs/docs/stable/installer/ro/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/ro/doPartitionDisks.xml
@@ -1,173 +1,214 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ro" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Partiționare</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the
-DrakX partitioning proposals for where to install
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the
-layout and content of your particular hard drive(s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Utilizează partițiile existente</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">Dacă această opțiune este disponibilă, atunci partițiile existente
+      <para revision="1" xml:id="doPartitionDisks-pa5">Dacă această opțiune este disponibilă, atunci partițiile existente
 compatibile Linux au fost găsite și pot fi utilizate pentru instalare.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Utilizează spațiul liber</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">Dacă aveți spațiu neutilizat pe discul dur, atunci această opțiune îl va
+      <para revision="1" xml:id="doPartitionDisks-pa7">Dacă aveți spațiu neutilizat pe discul dur, atunci această opțiune îl va
 utiliza pentru noua instalare de Mageia.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Utilizează spațiul liber de pe o partiție Windows</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">Dacă aveți spațiu neutilizat pe o partiție Windows existentă, instalatorul
-vă poate propune să-l utilizeze.</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">Aceasta poate fi o modalitate foarte practică de a face loc pentru noua
-instalare de Mageia, însă este o operație riscantă, așa că verificați bine
-că v-ați salvat toate datele importante!</para>
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Țineți cont că acest lucru implică reducerea dimensiunii partiției
 Windows. Partiția trebuie să fie „curată”, adică Windows a fost închis
 corect ultima dată cînd a fost utilizat. De asemenea, partiția trebuie să
 fie și defragmentată, cu toate că această operație nu garantează că toate
 fișierele de pe partiție au fost mutate din zona care este pe cale să fie
 utilizată. Este foarte recomandat să vă salvați toate fișierele personale.</para>
+      </important>
+    </listitem>
 
-        <para>With this option, the installer displays the remaining Windows partition in
-light blue and the proposed Mageia partition in dark blue with their
-intended sizes just underneath. You have the option to modify these sizes by
-clicking and dragging the gap between both partitions. See the following
-screen-shot.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Șterge și utilizează tot discul.</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">This option will allocate the entire drive for Mageia.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">ATENȚIE: aceasta va șterge TOATE datele de pe discul selecționat. Aveți
-grijă!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">Aceasta vă oferă controlul total asupra amplasării instalării pe discurile
+dure.</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">Dacă intenționați să utilizați o parte din disc pentru altceva, sau aveți
-deja date pe disc și nu sînteți pregătit să le pierdeți, atunci nu utilizați
-această opțiune.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Custom disk partitioning</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">Aceasta vă oferă controlul total asupra amplasării instalării pe discurile
-dure.</para>
-      </listitem>
-    </itemizedlist></para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para>If you are not using the <emphasis role="bold">Custom disk
-partitioning</emphasis> option, the installer will allocate the available
-space according to the following rules:</para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>If the total available space is less than 50 GB, then only one partition is
-created. This will be the <emphasis role="bold">/</emphasis> (root)
-partition.</para>
-      </listitem>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-      <listitem>
-        <para>If the total available space is greater than 50 GB, then three partitions
-are created</para>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 of the total available place is allocated to <emphasis
-role="bold">/</emphasis> with a maximum of 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 va fi alocat pentru swap cu un maximum de 4 Go</para>
-          </listitem>
-
-          <listitem>
-            <para>the rest (at least 12/19) is allocated to <emphasis
-role="bold">/home.</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-  <para>That means that from 160 GB or greater available space, the installer will
-create three partitions: 50 GB for <emphasis role="bold">/</emphasis>, 4 GB
-for <emphasis role="bold">swap</emphasis> and the remainder for <emphasis
-role="bold">/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
-automatically detected - or created if it does not exist yet, and mounted on
-/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to
-create a BIOS boot partition if not already existing. It is a roughly 1 MiB
-partition with no mount point. Choose <xref linkend="diskdrake"/> to be able
-to create it with the Installer like any other partition, just select BIOS
-boot partition as the filesystem type.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512. Due to lack of available hardware, the
 partitioning tool used in the installer has not been tested with such a
-drive. Also some SSD devices now use an erase block size over 1 MB. If you
-have such a device we suggest that you partition the drive in advance, using
-an alternative partitioning tool like <emphasis
-role="bold">gparted</emphasis>, and to use the following settings:</para>
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/ro/exitInstall.xml b/docs/docs/stable/installer/ro/exitInstall.xml
index 3f22bca7..6009a239 100644
--- a/docs/docs/stable/installer/ro/exitInstall.xml
+++ b/docs/docs/stable/installer/ro/exitInstall.xml
@@ -5,23 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">Ați terminat de instalat și configurat distribuția
-<application>Mageia</application>, iar acum puteți înlătura în siguranță
-mediul de instalare și redemara calculatorul.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems (if there are more than one) on your computer.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">Dacă nu ajustați parametrii încărcătorului de sistem, distribuția Mageia va
 fi selectată și pornită automat.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Profitați!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Vizitați www.mageia.org dacă aveți întrebări sau dacă doriți să contribuiți
-la Mageia</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/firewall.xml b/docs/docs/stable/installer/ro/firewall.xml
index 76692586..04287b54 100644
--- a/docs/docs/stable/installer/ro/firewall.xml
+++ b/docs/docs/stable/installer/ro/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="ro">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="ro" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Firewall</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Firewall</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
   <para>In the default setting (no button is checked), no service of the system is
-accessible from the network. The <emphasis role="bold">Everything (no
-firewall)</emphasis> enables access to all services of the machine - an
-option that does not make much sense in the context of the installer since
-it would create a totally unprotected system. Its veritable use is in the
-context of the Mageia Control Center (which uses the same GUI layout) for
-temporarily disabling the entire set of firewall rules for testing and
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
 debugging purposes.</para>
 
   <para>All other options are more or less self-explanatory. As an example, you will
-enable the <emphasis role="bold">CUPS server</emphasis> if you want printers
-on your machine to be accessible from the network.</para>
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where
-you can enable a series of services by typing a list of couples (blank
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
diff --git a/docs/docs/stable/installer/ro/formatPartitions.xml b/docs/docs/stable/installer/ro/formatPartitions.xml
index bf9cb71e..f7095d02 100644
--- a/docs/docs/stable/installer/ro/formatPartitions.xml
+++ b/docs/docs/stable/installer/ro/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="ro">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formatare în curs</title>
   </info>
@@ -11,32 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
 partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">În general trebuiesc formatate cel puțin partițiile selectate de DralX</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Apăsați pe <guibutton>Avansat</guibutton> pentru a alege partițiile pe care
-doriți să le verificați de <emphasis>sectoare defecte</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen,
-where you can choose to view details of your partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">Cînd sînteți sigur de selecția făcută, apăsați pe
-<guibutton>Înainte</guibutton> pentru a continua.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/ro/graphicalConfiguration.xml b/docs/docs/stable/installer/ro/graphicalConfiguration.xml
new file mode 100644
index 00000000..801a8f7a
--- /dev/null
+++ b/docs/docs/stable/installer/ro/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/ro/installUpdates.xml b/docs/docs/stable/installer/ro/installUpdates.xml
index c7b1793d..2ab789ad 100644
--- a/docs/docs/stable/installer/ro/installUpdates.xml
+++ b/docs/docs/stable/installer/ro/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="ro">
-  <info>
-    <title xml:id="installUpdates-ti1">Actualizări</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Actualizări</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">De la data lansării acestei versiuni de <application>Mageia</application>,
-unele pachete au fost actualizate sau îmbunătățite.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them,
-select <guilabel>No</guilabel> if you don't want to do this now, or if you
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
 aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Press <guibutton>Next</guibutton> to continue</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/installer.xml b/docs/docs/stable/installer/ro/installer.xml
index 27c4be02..a5756cb9 100644
--- a/docs/docs/stable/installer/ro/installer.xml
+++ b/docs/docs/stable/installer/ro/installer.xml
@@ -6,165 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, instalatorul Mageia</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, instalatorul Mageia</title>
   </info>
 
   <para>Fie că sînteți un nou utilizator GNU-Linux sau experimentat, instalatorul
 Mageia este conceput să vă ajute să faceți instalarea sau actualizarea cît
 se poate de ușor.</para>
 
-  <para>Meniul din ecranul inițial are diferite opțiuni, iar cea implicită este cea
-care va lansa instalatorul, care în mod normal este tot ceea ce vă trebuie.</para>
+  <section>
+    <title>Etapele instalării</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Ecranul de bun venit al instalării</title>
 
-    <section>
-      <title>Using a Mageia DVD</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>From this screen, you have access to options by pressing "<emphasis
-role="bold">e</emphasis>" to enter the edit mode. To come back to this
-screen, press either <emphasis role="bold">Esc</emphasis> key to quit
-without saving or press the key <emphasis role="bold">Ctrl</emphasis> or
-<emphasis role="bold">F10</emphasis> to quit with saving.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, it is possible to set some preferences (note that the
-options <emphasis role="bold">F1</emphasis> to <emphasis
-role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist>
-          <listitem>
-            <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis
-role="bold">F6</emphasis> options, you can view relevant help by pressing
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a
-specific language for the installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>If needed, change the screen resolution by pressing <emphasis
-role="bold">F3</emphasis> (Legacy mode only).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis role="bold">F6</emphasis> <emphasis
-role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis
-role="bold">e</emphasis> instead).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Default: It doesn't alter anything in the default options.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: Priority is given to the safer options at the price of a
-performance detriment.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI: (Advanced Configuration and Power Interface): Power management
-features are not used.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU
-interrupt. Select this option if you experience system misbehaviour like a
-kernel panic in relation to APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>Cînd selecționați una din aceste intrări, se modifică opțiunile implicite
-afișate pe linia <guilabel>Opțiuni de demaraj</guilabel>.</para>
-
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with
-<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot
-Options</guilabel> line, despite this, they will in fact be applied.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various
-boot options. Select an item with the arrow keys and press <emphasis
-role="bold">Enter</emphasis> for more details or press <emphasis
-role="bold">Esc</emphasis> to go back to the welcome screen.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>The detailed view about the splash option. Press <emphasis
-role="bold">Esc</emphasis> or select <guilabel>Return to Boot
-Options</guilabel> to go back to the options list. These options can be
-added by hand in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>Pentru informații suplimentare despre opțiunile nucleului pe sistemele vechi
-și UEFI consultați: <link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>Etapele instalării</title>
+    <section>
+      <title>UEFI Systems</title>
 
-    <para>The install process is divided into a number of steps, the status of which
-is indicated in a panel to the left of the screen.</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
-options.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
-about the particular step.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
-is possible to reboot, but please think twice before you do this. Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -175,19 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>După ecranul inițial nu ați ajuns în ecranul de selectat limba. Acest lucru
-se poate întîmpla cu unele plăci grafice și sisteme mai vechi. Încercați să
-utilizați o rezoluție mai mică tastînd <code>vgalo</code> la prompter.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this press <emphasis role="bold">Esc</emphasis> at the first welcome screen
-and confirm with <emphasis role="bold">ENTER</emphasis>. You will be
-presented with a black screen with the word "boot:". Type "text" and press
-<emphasis role="bold">ENTER</emphasis> to continue with the installation in
-text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -195,12 +195,11 @@ text mode.</para>
     <section>
       <title>Instalarea îngheață</title>
 
-      <para>Dacă sistemul pare să înghețe în timpul instalării, acest lucru poate
-însemna o problemă cu detectarea componentelor materiale. În acest caz
-detectarea automată a componentelor materiale poate fi omisă și reglată mai
-tîrziu. Pentru a încerca acest lucru, tastați <code>noauto</code> la
-prompter. Dacă este nevoie, această opțiune poate fi combinată și cu alte
-opțiuni.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -208,17 +207,18 @@ opțiuni.</para>
 
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Partiții dinamice</title>
 
-      <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis>
-format to <emphasis role="bold">dynamic</emphasis> format in Microsoft
-Windows, then it is not possible to install Mageia on this disc. To revert
-to a basic disk, see the Microsoft documentation: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/ro/locale.xml b/docs/docs/stable/installer/ro/locale.xml
new file mode 100644
index 00000000..dda174dc
--- /dev/null
+++ b/docs/docs/stable/installer/ro/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/ro/login.xml b/docs/docs/stable/installer/ro/login.xml
index 757db8ed..23647b6f 100644
--- a/docs/docs/stable/installer/ro/login.xml
+++ b/docs/docs/stable/installer/ro/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="ro"><info><title xml:id="label-to-adapt-ti1">Ecran de autentificare</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>Ecran de autentificare KDM</para></caption></mediaobject><para>În sfîrșit ajungeți la ecranul de autentificare.</para><para>Introduceți-vă numele de utilizator și parola și în cîteva secunde vă veți
-afla conectat în mediul de birou KDE sau GNOME în funcție de mediul Live pe
-care l-ați utilizat. De acum puteți începe să utilizați Mageia.</para><para>Informații suplimentare sînt disponibile pe <link
-ns4:href="https://wiki.mageia.org/en/Category:Documentation">Mageia
-wiki</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="ro">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/media_selection.xml b/docs/docs/stable/installer/ro/media_selection.xml
index d7eaf983..1c9ef408 100644
--- a/docs/docs/stable/installer/ro/media_selection.xml
+++ b/docs/docs/stable/installer/ro/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="ro">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Selectare medii (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Aici aveți lista depozitelor disponibile. Nu toate depozitele sînt
 disponibile, în funcție de mediile pe care le utilizați pentru
@@ -32,11 +41,11 @@ baza distribuției.</para>
     </listitem>
 
     <listitem>
-      <para>Depozitul <emphasis>Nonfree</emphasis> include pachete gratuite, pe care
-Mageia le poate deci distribui, însă conțin aplicații cu cod proprietar (de
-unde și numele „Nonfree”, însemnînd „non liber”). De exemplu, în acest
-depozit sînt incluși piloții proprietari pentru plăcile grafice nVidia și
-ATI, microcod pentru diverse plăci WiFi, etc.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/ro/minimal-install.xml b/docs/docs/stable/installer/ro/minimal-install.xml
index e3ce4a07..a47f5a79 100644
--- a/docs/docs/stable/installer/ro/minimal-install.xml
+++ b/docs/docs/stable/installer/ro/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="ro">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="ro">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Instalare minimală</title>
   </info>
@@ -10,30 +13,44 @@
 
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
-  <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+  
 
-  <para>Minimal Installation is intended for those with specific uses in mind for
-<application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the <emphasis
-role="bold">Individual package selection</emphasis> option mentioned above,
-to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>If you choose this installation method, then the relevant screen will offer
-you a few useful extras to install, such as documentation and X.</para>
+  
 
-  <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
 lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para>Documentația de bază este furnizată sub forma de pagini de manual sau de
-informații. Aceasta conține paginile de manual din <link
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
-Project</link> și paginile de informații din <link
+Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
-coreutils</link>.</para>
+coreutils</link> info pages.</para>
 
   <mediaobject>
 <imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
diff --git a/docs/docs/stable/installer/ro/misc-params.xml b/docs/docs/stable/installer/ro/misc-params.xml
index e19cc596..449162ae 100644
--- a/docs/docs/stable/installer/ro/misc-params.xml
+++ b/docs/docs/stable/installer/ro/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ro" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Rezumatul parametrilor diverși</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
 
   <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
 the choices you made and on the hardware detected. You can check the
 settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>As a general rule, it is recommended that you accept the default settings
@@ -26,7 +42,7 @@ unless:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>some other factor mentionned in the detailed sections below is an issue.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,46 +54,47 @@ unless:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Fus orar</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
 can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Țară / Regiune</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
 setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Încărcător de sistem</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX a făcut o alegeri bune pentru parametrii încărcătorului de sistem.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Pentru mai multe informații, consultați <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Gestionare utilizatori</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Puteți adăuga aici utilizatorii suplimentari. Fiecare va avea propriul său
-director <literal>/home</literal>.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Servicii</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
 (daemons).  This tool allows you to enable or disable certain processes.</para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Trebuie să verificați cu atenție înainte de a schimba ceva aici - o greșeală
-poate împiedica funcționarea corectă a calculatorului.</para>
-
-        <para>Pentru mai multe informații, consultați <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -89,7 +106,7 @@ poate împiedica funcționarea corectă a calculatorului.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Tastatură</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
 of keyboard.</para>
@@ -101,28 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Maus</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Aici puteți adăuga sau configura și alte dispozitive de indicare, precum
 tablete, trackball-uri, etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Placă de sunet</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The
-option to select a different driver is only given when there is more than
-one driver for your card, but where none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Interfață grafică</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Această secțiune vă permite să configurați plăcile grafice și ecranele.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Pentru mai multe informații, consultați <xref
-linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -137,11 +158,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Rețea</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, using the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
@@ -151,14 +172,14 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxyuri</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">Un server proxy acționează ca un intermediar între calculator și
-Internet. Această secțiune vă permite să configurați calculatorul ca să
-utilizeze un serviciu de proxy.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -170,27 +191,31 @@ need to enter here.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Nivel de securitate</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Aici puteți configura nivelul de securitate pentru calculator, în
-majoritatea cazurilor configurația implicită (Standard) este cea potrivită
-pentru o utilizare o obișnuită.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Bifați opțiunea care se potrivește cel mai bine cu modul  de utilizare.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Parafoc</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">Un parafoc este destinat să fie o barieră între datele voastre importante și
-escrocii de pe Internet care le-ar putea compromite sau fura.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Țineți cont că poate fi foarte riscant dacă permiteți totul (fără parafoc).</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/ro/reboot.xml b/docs/docs/stable/installer/ro/reboot.xml
index fcefe7b6..5050b595 100644
--- a/docs/docs/stable/installer/ro/reboot.xml
+++ b/docs/docs/stable/installer/ro/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ro" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Repornește</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/ro/securityLevel.xml b/docs/docs/stable/installer/ro/securityLevel.xml
index 77abc011..319dd27d 100644
--- a/docs/docs/stable/installer/ro/securityLevel.xml
+++ b/docs/docs/stable/installer/ro/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ro" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Nivel de securitate</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended
-setting for the average user. The <emphasis role="bold">Secure</emphasis>
-setting will create a highly protected system - for instance if the system
-is to be used as a public server.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Security Administrator</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
 which require notification to a system administrator.</para>
 
-  <para>A good, and easy-to-implement, choice is to enter &lt;user>@localhost -
-where &lt;user> is the login name of the user to receive these messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
 be configured for receiving such mail!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/ro/selectCountry.xml b/docs/docs/stable/installer/ro/selectCountry.xml
index d710b630..87412712 100644
--- a/docs/docs/stable/installer/ro/selectCountry.xml
+++ b/docs/docs/stable/installer/ro/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="ro">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="ro">
   <info>
     <title xml:id="selectCountry-ti1">Selectați țara / regiunea</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> option and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem that a country from the
-first list was chosen. Please ignore this, as DrakX will apply your actual
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,7 +40,7 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Metodă de intrare</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
@@ -39,9 +50,9 @@ selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via <emphasis role="bold">Configure
-your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
-running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/selectInstallClass.xml b/docs/docs/stable/installer/ro/selectInstallClass.xml
index 7c4fc2b4..12be4d03 100644
--- a/docs/docs/stable/installer/ro/selectInstallClass.xml
+++ b/docs/docs/stable/installer/ro/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="ro" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Instalare sau actualizare</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Instalare</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option to perform a fresh installation of
-<application>Mageia</application>. This will format the root partition (/),
-but can preserve a separated /home partition.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Actualizare</para>
-
-      <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that has reached
-its End Of Life, then it is better to do a clean install instead while
-preserving your <literal>/home</literal> partition.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that, and only if you are very sure
-rebooting is what you want, go to a text terminal by pressing <guilabel>Alt
-Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the <emphasis role="bold">Install or Upgrade</emphasis>
-screen to the language choice screen by pressing <guilabel>Alt Ctrl
-Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do
-this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ro/selectKeyboard.xml b/docs/docs/stable/installer/ro/selectKeyboard.xml
index daaf95a6..cec42da1 100644
--- a/docs/docs/stable/installer/ro/selectKeyboard.xml
+++ b/docs/docs/stable/installer/ro/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="ro">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,20 +19,23 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Tastatură</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX selecționează tastatura potrivită pentru limba aleasă. Dacă nu s-a
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX selecționează tastatura potrivită pentru limba aleasă. Dacă nu s-a
 găsit tastatura potrivită, se va reveni implicit la dispunerea de tastatură
 US.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Verificați că selecția este corectă sau alegeți altă dispunere de
+      <para revision="1" xml:id="selectKeyboard-pa2">Verificați că selecția este corectă sau alegeți altă dispunere de
 tastatură. Dacă nu știți ce dispunere are tastatura, uitați-vă pe
 specificațiile sistemului, sau întrebați furnizorul de la care l-ați
 cumpărat. Poate că există o etichetă pe tastatură care indică dispunerea. Vă
@@ -28,23 +44,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a fuller list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this and
-continue the installation: the keyboard chosen from the full list will be
-applied.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
 extra dialogue screen asking how you would prefer to switch between the
 Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ro/selectKeyboardLive.xml b/docs/docs/stable/installer/ro/selectKeyboardLive.xml
index 2960da81..13842f80 100644
--- a/docs/docs/stable/installer/ro/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/ro/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ro" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Selectați tastatura</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>Veți fi solicitat să definiți dispunerea tastaturii pe care doriți s-o
-utilizați în Mageia. Implicit este selectată una în funcție de limba și de
-fusul orar selectate precedent.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/ro/selectLanguage.xml b/docs/docs/stable/installer/ro/selectLanguage.xml
index 17d6d6d4..40f1fabb 100644
--- a/docs/docs/stable/installer/ro/selectLanguage.xml
+++ b/docs/docs/stable/installer/ro/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ro" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,50 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Alegeți limba ce va fi utilizată</title>
   </info>
 
-  <para condition="classical">Selectați limba preferată, desfășurînd mai întîi lista
-continentului. <application>Mageia</application> va utiliza această alegere
-pe parcursul instalării și după pentru pentru sistemul instalat.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">If it is likely that you (or others) will require several languages to be
-installed on your system, then you should use the <guibutton>Multiple
-languages</guibutton> option to add them now. It will be difficult to add
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
 extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
+  <important condition="classical">
     <para>Even if you choose more than one language, you must first choose one as your
-preferred language in the first language screen. It will also be marked as
-chosen in the multiple languages screen.</para>
-  </warning>
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
-      <para>Dacă dispunerea tastaturii nu este aceeași cu limba preferată, atunci este
-recomandat să instalați și limba pentru dispunerea tastaturii.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia utilizează UTF-8 (Unicode) implicit.</para>
-
-      <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple
-languages</emphasis> screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>Puteți schimba limba sistemului și după instalare din Centrul de Control
-Mageia -> Sistem -> Gestionați localizarea sistemului.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ro/selectMouse.xml b/docs/docs/stable/installer/ro/selectMouse.xml
index 351648ec..59b97f9a 100644
--- a/docs/docs/stable/installer/ro/selectMouse.xml
+++ b/docs/docs/stable/installer/ro/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="ro">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Selectați mausul</title>
   </info>
@@ -7,26 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Dacă nu sînteți mulțumit de cum reacționează mausul, puteți alege un altul
 aici.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">În general <guilabel>Universal</guilabel> - <guilabel>Orice maus PS/2 și
-USB</guilabel> este o alegere bună.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Selectați <guilabel>Universal</guilabel> - <guilabel>Forțează
-evdev</guilabel> pentru a configura butoanele care nu funcționează la
-mausurile cu șase sau mai multe butoane.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/ro/setupBootloader.xml b/docs/docs/stable/installer/ro/setupBootloader.xml
index a038f359..94729fce 100644
--- a/docs/docs/stable/installer/ro/setupBootloader.xml
+++ b/docs/docs/stable/installer/ro/setupBootloader.xml
@@ -1,146 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="ro" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="ro" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Opțiunile principale ale încărcătorului de sistem</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Bootloader interface</title>
-    <para>By default, Mageia uses exclusively:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot
-choose between the <emphasis role="bold">with</emphasis> or <emphasis
-role="bold">without graphical menu</emphasis> options.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to house the bootloader
-(GRUB2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds GRUB2-efi. Although it is possible to have
-several ESPs, only one is required (and advised), whatever the number of
-operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Se utilizează un încărcător de sistem Mageia</title>
-    <para>By default, and according to your system, Mageia writes one of the
-following:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then untick the <emphasis
-role="bold">Probe Foreign OS</emphasis> option.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
   <section>
-    <title>Se utilizează încărcătorul de sistem existent</title>
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this documentation, however in most cases it will
-involve running the relevant bootloader installation program which should
-detect and add it automatically. See the documentation for the operating
-system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Options</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>First page</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you
-set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be required when booting
-to select a booting entry or change settings. The username is <emphasis
-role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will
-check that it matches with the one above.</para></listitem><listitem><para><guilabel>Advanced</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for power management. It can save energy by
-stopping unused devices.  Deselecting it could be useful if, for example,
-your computer does not support ACPI or if you think the ACPI implementation
-might cause some problems (for instance random reboots or system lockups).</para></listitem><listitem><para><guilabel>Enable SMP</guilabel>: This option enables/disables symmetric
-multiprocessing for multi core processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the operating system access to
-the Advanced Programmable Interrupt Controller. APIC devices permit more
-complex priority models, and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC manages all external
-interrupts for a specific processor in an SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Opțiunile principale ale încărcătorului de sistem</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Next page</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-to be used by the boot menu. If you click the down triangle you will be
-offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Se utilizează încărcătorul de sistem existent</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Adăugați sau modificați o intrare din meniul de demaraj</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/setupSCSI.xml b/docs/docs/stable/installer/ro/setupSCSI.xml
index e2abafca..622f9c9c 100644
--- a/docs/docs/stable/installer/ro/setupSCSI.xml
+++ b/docs/docs/stable/installer/ro/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="ro">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Configurare SCSI</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
 SCSI controllers it may be unable to determine the correct drivers to use
 and subsequently fail to recognise the drive.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s)
-you have.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">DrakX va putea atunci să le configureze corect.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/ro/software.xml b/docs/docs/stable/installer/ro/software.xml
new file mode 100644
index 00000000..c28c58de
--- /dev/null
+++ b/docs/docs/stable/installer/ro/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="ro" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/ro/soundConfig.xml b/docs/docs/stable/installer/ro/soundConfig.xml
index d4430de6..b523b2b5 100644
--- a/docs/docs/stable/installer/ro/soundConfig.xml
+++ b/docs/docs/stable/installer/ro/soundConfig.xml
@@ -1,41 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="ro">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Configurare sunet</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if one exists.</para>
+  
 
-  <para>Pilotul implicit ar trebui să funcționeze fără probleme. Totuși, dacă
-întîlniți probleme după instalare, atunci executați
-<command>draksound</command> sau lansați această unealtă via MCC (Mageia
-Control Center), alegînd categoria <guilabel>Componente materiale</guilabel>
-și faceți clic pe <guilabel>Configurare sunet</guilabel> în partea din
-dreapta sus a ecranului.</para>
+  
 
-  <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis
-role="bold">Sound Configuration</emphasis> tool screen, click on
-<guibutton>Troubleshooting</guibutton> to find useful advice about how to
-solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Avansat</title>
     </info>
 
-    <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in
-this screen, during install, is useful if there is no default driver and
-there are several drivers available, but you think the installer selected
-the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on <emphasis
-role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ro/takeOverHdConfirm.xml b/docs/docs/stable/installer/ro/takeOverHdConfirm.xml
index 35264c30..65c4c238 100644
--- a/docs/docs/stable/installer/ro/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/ro/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="ro">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Confirmați formatarea discului dur</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is
-ok to erase every partition, every operating system and all data that might
-be on that hard disk.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/ro/testing.xml b/docs/docs/stable/installer/ro/testing.xml
index 676a839d..0381c213 100644
--- a/docs/docs/stable/installer/ro/testing.xml
+++ b/docs/docs/stable/installer/ro/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Se testează Mageia ca sistem Live</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Se testează Mageia ca sistem Live</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,22 +17,20 @@
       <title xml:id="testing1-ti1">Modul Live</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>Obțineți acest ecran dacă ați selectat „Demarează Mageia”. Altfel obțineți
-etapa de „<link linkend="doPartitionDisks">Partiționare</link>"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Se testează componentele materiale</title>
       </info>
 
-      <para>Unul din scopurile mediului Live este să testați dacă Mageia gestionează
-corect componentele materiale ale calculatorului. Puteți verifica dacă
-fiecare dispozitiv dispune de un pilot adecvat în secțiunea Componente
-materiale a Centrului de Control Mageia. Puteți testa majoritatea
-componentelor curente:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -37,11 +38,7 @@ componentelor curente:</para>
         </listitem>
 
         <listitem>
-          <para>placă grafică: dacă s-a afișat ecranul precedent, este deja OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>videocameră:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -49,7 +46,7 @@ componentelor curente:</para>
         </listitem>
 
         <listitem>
-          <para>imprimantă: configurați-o și tipăriți o pagină de test</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -57,10 +54,13 @@ componentelor curente:</para>
         </listitem>
       </itemizedlist>
 
-      <para>Dacă este totul OK puteți proceda cu instalarea. Dacă nu, puteți părăsi cu
-butonul de abandonare.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>Parametrii configurați aici vor fi păstrați pentru instalare.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -68,14 +68,14 @@ butonul de abandonare.</para>
         <title xml:id="testing3-ti1">Lansează instalarea</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>Pentru a lansa de pe mediul Live instalarea distribuției Mageia pe discul
-dur sau SSD, faceți pur și simplu clic pe pictograma „Instalează pe discul
-dur”. Veți obține acest ecran, iar apoi „etapa de <link
-linkend="doPartitionDisks">Partiâionare</link> ca pentru instalarea directă.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/ro/uninstall-Mageia.xml b/docs/docs/stable/installer/ro/uninstall-Mageia.xml
index 56c22cd4..30688716 100644
--- a/docs/docs/stable/installer/ro/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/ro/uninstall-Mageia.xml
@@ -1,30 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="ro">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ro" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Dezinstalare Mageia</title>
   </info>
 
   
 
+  
+
   <para>If Mageia didn't convince you or you can't install it correctly - in short
 you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-  <para>After your data backup, reboot your Mageia installation DVD and select
-<emphasis role="bold">Rescue system</emphasis>, then, <emphasis
-role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
-will only have Windows, with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>In Windows to recover the space used by Mageia partitions: click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code>. You will recognize a Mageia partition
-because they are labeled <guilabel>Unknown</guilabel>, and also by their
-size and place on the disk. Right click on each of these partitions and
-select <guibutton>Delete</guibutton> to free up the space.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-  <para>Dacă utilizați Windows XP, puteți crea o partiție nouă și s-o formatați
-(FAT32 sau NTFS). Aceasta va primi o literă de partiție.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>If you have Vista or 7, you have one more possibility, you can extend the
 existing partition that is at the left of the freed space. There are other
@@ -32,4 +45,4 @@ partitioning tools that can be used, such as <emphasis
 role="bold">gparted</emphasis>, available for both Windows and Linux. As
 always, when changing partitions, be very careful to back up anything
 important to you.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/ro/unused.xml b/docs/docs/stable/installer/ro/unused.xml
index 8e6441c5..c2ddf337 100644
--- a/docs/docs/stable/installer/ro/unused.xml
+++ b/docs/docs/stable/installer/ro/unused.xml
@@ -1,28 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ro" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="ro">
   <info>
     <title xml:id="unused-ti1">Păstrează sau înlătură materialele neutilizate</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
 
-  <para>La această etapă instalatorul face lista pachetelor cu localizări și a
-componentelor materiale neutilizate. Apoi vă propune să le ștergeți. Este
-recomandat să acceptați, doar dacă pregătiți o instalare care va rula pe
-diferite componente materiale.</para>
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>Următoarea etapă este copierea fișierelor pe discul dur. Acest lucru poate
-dura cîteva minute bune. La sfîrșit veți avea un ecran alb pentru cîteva
-momente, este normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/ru/.directory b/docs/docs/stable/installer/ru/.directory
new file mode 100644
index 00000000..9d5137ec
--- /dev/null
+++ b/docs/docs/stable/installer/ru/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2019,1,8,19,56,22
+Version=4
+ViewMode=1
diff --git a/docs/docs/stable/installer/sk/DrakLive-cover.xml b/docs/docs/stable/installer/sk/DrakLive-cover.xml
index 4c9b04f3..dd100ee9 100644
--- a/docs/docs/stable/installer/sk/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/sk/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="sk" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="sk" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Inštalácia zo ŽIVÉHO dátového nosiča</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Január 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Inštalácia zo ŽIVÉHO dátového nosiča</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Oficiálna dokumentácia pre Mageiu</para>
+      <para role="tagline">Oficiálna dokumentácia pre Mageiu</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Texty a snímky obrazovky v tomto manuále sú dostupný pod licenciou CC BY-SA
+
+      <para>Texty a snímky obrazovky v tomto manuále sú dostupný pod licenciou CC BY-SA
 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-            </para>
-            <para>Tento manuál bol vytvorený s pomocou <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Tento manuál bol vytvorený s pomocou <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> vyvinutého <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>om.
-            </para>
-            <para>Bol napísaný dobrovoľníkmi v ich voľnom čase. Skontaktujte prosím <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>om.</para>
+
+      <para>Bol napísaný dobrovoľníkmi v ich voľnom čase. Skontaktujte prosím <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentačný
-tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</para> 
+tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</para>
     </cover>
   </info>
+
   <article>
     <title>Inštalácia zo ŽIVÉHO dátového nosiča</title>
-       <para><note>
-          <para>Nikto sa nestretne so všetkými inštalačnými obrazovkami, ktoré vidíte v
+
+    <para><note>
+        <para>Nikto sa nestretne so všetkými inštalačnými obrazovkami, ktoré vidíte v
 tomto manuáli. Ktorú obrazovku uvidíte, záleží na vašom hardvéri a na
 voľbách, ktoré spravíte počas inštalácie.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/sk/DrakLive.xml b/docs/docs/stable/installer/sk/DrakLive.xml
index 5259eefe..f909a86c 100644
--- a/docs/docs/stable/installer/sk/DrakLive.xml
+++ b/docs/docs/stable/installer/sk/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="sk" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="sk" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Inštalácia zo ŽIVÉHO dátového nosiča</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Inštalácia zo ŽIVÉHO dátového nosiča</title>
 
     <cover>
       <para><note>
@@ -17,9 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> vyvinutého <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>om.</para>
 
-      <para>Bol napísaný dobrovoľníkmi v ich voľnom čase. Skontaktujte prosím <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentačný
-tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</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>
 
@@ -39,7 +54,12 @@ tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +69,18 @@ tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/sk/DrakX-cover.xml b/docs/docs/stable/installer/sk/DrakX-cover.xml
index c4e72a41..b29ddacf 100644
--- a/docs/docs/stable/installer/sk/DrakX-cover.xml
+++ b/docs/docs/stable/installer/sk/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="sk" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="sk" xml:id="Quick-Startup"
+      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>Inštalácia s DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Február 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Február 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Oficiálna dokumentácia pre Mageiu</para>
+      <para role="tagline">Oficiálna dokumentácia pre Mageiu</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>Texty a snímky obrazovky v tomto manuále sú dostupný pod licenciou CC BY-SA
+
+      <para>Texty a snímky obrazovky v tomto manuále sú dostupný pod licenciou CC BY-SA
 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Tento manuál bol vytvorený s pomocou <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Tento manuál bol vytvorený s pomocou <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> vyvinutého <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>om.
-	    </para>
-            <para>Bol napísaný dobrovoľníkmi v ich voľnom čase. Skontaktujte prosím <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>om.</para>
+
+      <para>Bol napísaný dobrovoľníkmi v ich voľnom čase. Skontaktujte prosím <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentačný
-tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</para> 
+tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Inštalácia s DrakX</title>
-       <para><note>
-          <para>Nikto sa nestretne so všetkými inštalačnými obrazovkami, ktoré vidíte v
+
+    <para><note>
+        <para>Nikto sa nestretne so všetkými inštalačnými obrazovkami, ktoré vidíte v
 tomto manuáli. Ktorú obrazovku uvidíte, záleží na vašom hardvéri a na
 voľbách, ktoré spravíte počas inštalácie.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ voľbách, ktoré spravíte počas inštalácie.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/sk/DrakX-inline.xml b/docs/docs/stable/installer/sk/DrakX-inline.xml
new file mode 100644
index 00000000..63839e21
--- /dev/null
+++ b/docs/docs/stable/installer/sk/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="sk" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Inštalácia s DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>Nikto sa nestretne so všetkými inštalačnými obrazovkami, ktoré vidíte v
+tomto manuáli. Ktorú obrazovku uvidíte, záleží na vašom hardvéri a na
+voľbách, ktoré spravíte počas inštalácie.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Texty a snímky obrazovky v tomto manuále sú dostupný pod licenciou CC BY-SA
+3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Tento manuál bol vytvorený s pomocou <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> vyvinutého <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>om.</para>
+
+      <para>Bol napísaný dobrovoľníkmi v ich voľnom čase. Skontaktujte prosím <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentačný
+tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/DrakX.xml b/docs/docs/stable/installer/sk/DrakX.xml
index a3a71932..7073586d 100644
--- a/docs/docs/stable/installer/sk/DrakX.xml
+++ b/docs/docs/stable/installer/sk/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="sk" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="sk" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Inštalácia s DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Inštalácia s DrakX</title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ tím</link>, ak by ste chceli pomôcť vylepšiť tento manuál.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/sk/SelectAndUseISOs2.xml b/docs/docs/stable/installer/sk/SelectAndUseISOs2.xml
index c9081dea..450a0a04 100644
--- a/docs/docs/stable/installer/sk/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/sk/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="sk" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Vyberte a používajte ISO</title>
   </info>
   <section>
     <title>Úvod</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
-    <para>There are two families of media:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: Booting with this media provides you with the maximum
-flexibility when choosing what to install, and for configuring your
-system. In particular, you have a choice of which Desktop environment to
-install</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: This option allows you to try out Mageia without having to
-actually install it, or make any changes to your computer.  If the
-installation is decided, the process is simpler, but you get fewer choices
-than offered by the Classical installer</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Podrobnosti sú uvedené v ďalších častiach.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Dátové nosiče</title>
     <section>
       <title>Definícia</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support (DVD, USB
-stick, ...) the ISO file is copied to.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
@@ -43,24 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>Bežné vlastnosti</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the Classical installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
             <para>They are used for performing clean installs or to upgrade a previously
-installed version of Mageia.</para>
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Niektoré nástroje sú dostupné na Uvítacej obrazovke: Záchranný systém,
-Pamäťový test, Nástroj na detekciu hardvéru.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Každé DVD obsahuje mnohé dostupné prostredia pracovnej plochy a jazyky.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Počas inštalácie vám bude daná voľba pridať si neslobodný softvér.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -72,21 +107,19 @@ Pamäťový test, Nástroj na detekciu hardvéru.</para>
         <itemizedlist>
           <listitem>
             <para>Can be used to preview the Mageia operating system without having to install
-it. Can also be used to install Mageia if you wish.</para>
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade previously installed Mageia
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Obsahujú neslobodný softvér.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -94,13 +127,13 @@ releases.</emphasis></para>
         <title>Live DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Plasma desktop environment only.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -108,13 +141,13 @@ releases.</emphasis></para>
         <title>Živé DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>ibe GNOME prostredie pracovnej plochy.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -122,13 +155,13 @@ releases.</emphasis></para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Xfce desktop environment only.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 or 64 bit architectures.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -139,22 +172,10 @@ releases.</emphasis></para>
         <title>Bežné vlastnosti</title>
         <itemizedlist>
           <listitem>
-            <para>These are minimal ISO's containing no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient if
-bandwidth is too low to download a full DVD, or if you have a PC without a
-DVD drive or is unable to boot from a USB stick.</para>
-          </listitem>
-          <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>First steps are English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -162,8 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -171,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Obsahuje neslobodný softvér (zväčša ovládače, kodeky...) pre ľudí, ktorí ich
-potrebujú.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -184,16 +204,23 @@ potrebujú.</para>
       <title>Sťahovanie</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, you are provided with some information, such as
-the mirror in use and an option to switch if the bandwidth is too low. If
-http is chosen, you will also see something regarding checksums.</para>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the
-other, and copy the checksum <link linkend="integrity">for later
-use</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
@@ -201,52 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
 algorithm from the file to be downloaded. You may compare the checksum of
 your downloaded ISO against that of the original source ISO. If the
 checksums do not match, it means that the actual data on the ISO's do not
-match, and if it is the case, then you should retry the download or attempt
-a repair using BitTorrent.</para>
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>To generate the checksum for your downloaded ISO, open a console, (no need
 to be root), and:</para>
       <itemizedlist>
         <listitem>
-          <para>To use md5sum, type: <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>To use sha1sum, type: <userinput>sha1sum
-path/to/the/image/file.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Example:</para>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Vypálenie alebo vpísanie ISO súboru</title>
-    <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
-stick. This is not a standard copy operation as a bootable medium will
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
 actually be created.</para>
     <section>
       <title>Napálenie ISO súboru na CD/DVD</title>
-      <para>Whichever software you use, ensure that the option to burn an <emphasis
-role="bold">image</emphasis> is used, burn <emphasis
-role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not
-correct. See <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link> for more information.</para>
     </section>
     <section>
       <title>Vpísať ISO na USB kľúčenku</title>
-      <para>Všetky ISO súbory Mageie sú hybridy, čo znamená, že ich môžete 'vpísať' na
-USB kľúč a potom ho použiť na zavedenie a inštaláciu systému.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any existing data will be lost and the partition capacity will
-be reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>Pre obnovu pôvodnej kapacity, musíte znovu prerobiť partíciu USB kľúča a
-naformátovať ho.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Použitím grafického nástroja v Mageii</title>
         <para>Môžete použiť grafický nástroj akým je <link
@@ -258,7 +296,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <itemizedlist>
           <listitem>
             <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -267,7 +305,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Použijúc Príkazový riadok v systéme GNU/Linux</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk overwriting
 potentially valuable existing data if you specify the wrong target device.</para>
@@ -277,28 +315,27 @@ potentially valuable existing data if you specify the wrong target device.</para
             <para>Otvorte konzolu</para>
           </listitem>
           <listitem>
-            <para>Become a root (Administrator) user with the command <userinput>su
--</userinput> (don't forget the final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Vsuňte váš USB kľúč (nepripájajte ho mountom, čo tiež znamená, neotvárajte
-žiadnu aplikáciu alebo správcu súborov, ktorý by ho mohol sprístupniť alebo
-z neho čítať)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Vložte príkaz <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
             <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
             <para>Alternatively, you can find the device name with the command
-<code>dmesg</code>: towards the end of this example, you can see the device
-name starting with <emphasis>sd</emphasis>, and in this case,
-<emphasis>sdd</emphasis> is the actual device. You can also see that its
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
 size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
@@ -320,21 +357,22 @@ size is 2GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: <emphasis role="bold"># <userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Where X=your device name eg: /dev/sdd</para>
-            <para>Example:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-and <emphasis role="bold">of</emphasis> stands for <emphasis
-role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Vložte príkaz: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>This is the end of the process, and you may now unplug your USB stick.</para>
@@ -343,4 +381,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/acceptLicense.xml b/docs/docs/stable/installer/sk/acceptLicense.xml
index 0bc072f8..1a20c3de 100644
--- a/docs/docs/stable/installer/sk/acceptLicense.xml
+++ b/docs/docs/stable/installer/sk/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Licencia a poznámky k vydaniu</title>
   </info>
 
@@ -46,19 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">Licenčné ujednanie</title>
     </info>
 
-    <para>Pred inštaláciou <application>Mageie</application>, si starostlivo
-prečítajte licenčné podmienky a ustanovenia.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Tieto podmienky a ujednania sa vzťahujú na celú distribúciu
-<application>Mageia</application>, skôr než budete pokračovať, musia byť
-prijaté.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>To proceed, simply select <guilabel>Accept</guilabel> and then click on
-<guibutton>Next</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Ak sa rozhodnete neprijať tieto podmienky, potom vám ďakujeme za
-nahliadnutie. Kliknutím na <guibutton>Ukončiť</guibutton> sa reštartuje
-počítač.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -76,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Important information about this release of
-<application>Mageia</application> can be viewed by clicking on the
-<guibutton>Release Notes</guibutton> button.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/addUser.xml b/docs/docs/stable/installer/sk/addUser.xml
index dbef4267..23bb8fcc 100644
--- a/docs/docs/stable/installer/sk/addUser.xml
+++ b/docs/docs/stable/installer/sk/addUser.xml
@@ -1,32 +1,51 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sk" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Spravovanie používateľa a superpoužívateľa</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Nastavenie správcovho (rootovho) hesla:</title>
     </info>
 
-    <para>It is advisable for all <application>Mageia</application> installations to
-set a <emphasis role="bold">superuser</emphasis> (administrator) password,
-usually called the <emphasis>root password</emphasis> in Linux. As you type
-a password into the top box a shield will change from red to yellow to green
-depending on the strength of the password. A green shield shows you are
-using a strong password. You need to repeat the same password in the box
-underneath, to check that the first entry was not mistyped.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>All passwords are case sensitive. It is best to use a mixture of letters
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
 (upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
@@ -36,43 +55,46 @@ underneath, to check that the first entry was not mistyped.</para>
       <title xml:id="enterUser-ti3">Pridať používateľa</title>
     </info>
 
-    <para>Add a user here. A regular user has fewer privileges than the <emphasis
-role="bold">superuser</emphasis> (root), but enough to use the internet,
-office applications or play games and anything else the average user might
-use their computer for.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Ikona</guibutton>: ak kliknete na toto tlačidlo, zmení sa ikona
-používateľa.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Reálne meno</guilabel>: Do tohto textového políčka vložte reálne
-používateľovo meno.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use
-a version of the user's real name. <emphasis role="bold">The login name is
-case sensitive.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password</guilabel>: Type in the user password. There is a shield
-at the end of the text box that indicates the strength of the password. (See
-also <xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password (again)</guilabel>: Retype the user password DrakX will
-check that you have not mistyped the password.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Any users you added while installing Mageia, will have a home directory that
-is both read and write protected (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
@@ -82,32 +104,31 @@ management</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Rozšírená správa používateľov</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>The <guibutton>Advanced</guibutton> option allows you to edit further
-settings for the user you are adding.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
-<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis>
-and <emphasis role="bold">Sh</emphasis></para>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the <emphasis
-role="bold">user ID</emphasis> for any user you added in the previous
-screen. If you are unsure what the purpose of this is, then leave it blank.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sk/add_supplemental_media.xml b/docs/docs/stable/installer/sk/add_supplemental_media.xml
index e72c8041..859a2325 100644
--- a/docs/docs/stable/installer/sk/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/sk/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="sk">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Výber zdroja (Nastavenie doplnkových inštalačných zdrojov)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,43 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>This screen shows you the list of already recognized repositories. You can
-add other sources for packages, like an optical disc or a remote source.
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
 The source selection determines which packages will be available during the
-next steps.</para>
+subsequent steps.</para>
 
   <para>Pre sieťové zdroje, sú potrebné dva nasledujúce kroky:</para>
 
   <orderedlist>
     <listitem>
-      <para>Výber a aktivácia siete, ak nie je už spustená.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
       <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
 mirror, you have access to the selection of all repositories managed by
-Mageia, like the <emphasis role="bold">Nonfree</emphasis>, the <emphasis
-role="bold">Tainted</emphasis> repositories and the <emphasis
-role="bold">Updates</emphasis>. With the URL, you can designate a specific
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
 repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>If you are updating a 64 bit installation which may contain some 32 bit
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
 packages, it is advised to use this screen to add an online mirror by
-ticking one of the Network protocols here. The 64-bit DVD ISO only contains
-64-bit and noarch packages, it will not be able to update the 32-bit
-packages. However, after adding an online mirror, the installer will find
-the needed 32-bit packages there.</para>
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/ask_mntpoint_s.xml b/docs/docs/stable/installer/sk/ask_mntpoint_s.xml
index 24687d42..bf1cb64a 100644
--- a/docs/docs/stable/installer/sk/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/sk/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="sk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Zvoľte body pripojenia</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Tu vidíte Linuxové partície, ktoré boli nájdené na vašom počítači. Ak
-nesúhlasíte s návrhom <application>DrakX</application>u, môžete prípojné
-body zmeniť.</para>
-
-  <note>
-    <para>If you change anything, make sure you still have a <emphasis
-role="bold"><literal>/</literal></emphasis> (root) partition.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis
-role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
-name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis>
-(for example, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>If you have several partitions, you can choose various different mount
-points from the drop down menu, such as <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis
-role="bold">/var</emphasis>. You can even make your own mount points, for
-instance <emphasis role="bold"><literal>/video</literal></emphasis> for a
-partition where you want to store your films, or <emphasis
-role="bold">/Data</emphasis> (or some other name) for your data.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -79,13 +82,17 @@ mount point field blank.</para>
   </itemizedlist>
 
   <warning>
-    <para>If you are not sure what to choose, click <emphasis
-role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
-disk partitioning</guilabel>, where, you can click on a partition to see its
-type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Ak ste si istí, že prípojné body sú správne, kliknite na
-<guibutton>Ďalej</guibutton> a vyberte si, či chcete naformátovať len tú
-partíciu (resp. partície), ktoré DrakX navrhuje, alebo i ďalšie.</para>
-</section>
\ No newline at end of file
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/sk/bestTime.xml b/docs/docs/stable/installer/sk/bestTime.xml
index 342f5844..444e3052 100644
--- a/docs/docs/stable/installer/sk/bestTime.xml
+++ b/docs/docs/stable/installer/sk/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sk" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="sk" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Nastavenie času</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>V tomto kroku si máte vybrať, na ktorý čas sú nastavené vaše interné hodiny,
-buď miestny čas alebo UTC čas.</para>
-
-  <para>Na karte pokročilé nájdete viac možností pre nastavenie času.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/bootLive.xml b/docs/docs/stable/installer/sk/bootLive.xml
index c0634d8f..52a5efa9 100644
--- a/docs/docs/stable/installer/sk/bootLive.xml
+++ b/docs/docs/stable/installer/sk/bootLive.xml
@@ -1,28 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="sk"><info><title xml:id="bootLive-ti1">Zaviesť Mageiu ako Živý systém</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Zavedenie z dátového nosiča</title></info><section><info><title xml:id="bootLive11-ti1">Z disku</title></info><para>Systém môžete zaviesť z nosiča, na ktorý ste napálili váš obrazový súbor
-(CDčko, DVDčko...). Zvyčajne ho stačí len vložiť do vašej CD/DVD mechaniky,
-aby zavádzač spustil inštaláciu automaticky po reštarte počítača. Ak sa to
-nestane, možno potrebujete prekonfigurovať váš BIOS alebo stlačiť jednu
-klávesu, ktorá vám ponúkne vybrať si zariadenie, z ktorého sa počítač
-zavedie.</para><para>Podľa toho ktorý máte hardvér a ako je nakonfigurovaný, objaví sa buď jedna
-alebo druhá z dvoch nižšie uvedených obrazoviek.</para></section><section><info><title xml:id="bootLive12-ti1">Z USB zariadenia</title></info><para>Počítač môžete naštartovať z USB zariadenia, na ktorom je zaznamenaný váš
-ISO obraz. Vzhľadom na nastavenia vášho BIOSu sa počítač možno už zavádza
-priamo z USB zariadenia zastrčeného v porte počítača. Ak sa tak nedeje,
-možno potrebujete prekonfigurovať váš BIOS alebo stlačiť jednu klávesu,
-ktorá vám ponúkne vybrať si periférium, z ktorého sa naštartuje počítač.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">V zastaralom BIOS/CSM režime</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Prvá obrazovka počas spúšťania v BIOSovom režime</para></caption></mediaobject><para>V prostrednej ponuke, máte voľbu medzi tromi akciami:</para><itemizedlist><listitem><para>Zaviesť Mageiu: Toto znamená že Mageia 5 sa spustí z pripojeného nosiča
-(CD/DVD alebo USB kľúča) bez akéhokoľvek zapisovania na disk, takže
-očakávajte veľmi pomalý systém. Keď sa zavádzanie dokončí, môžete prikročiť
-i ku inštalácií na pevný disk.</para></listitem><listitem><para>Nainštalovať Mageiu: Táto voľba priamo nainštaluje Mageiu na pevný disk.</para></listitem><listitem><para>Spustiť z pevného disku: Táto voľba dovoľuje zaviesť systém z pevného disku,
-tak ako zvyčajne, keď žiadne médium (CD/DVD alebo USB kľúč) nie je
-pripojené. (nepracuje sa s Mageiou 5).</para></listitem></itemizedlist><para>V spodnej ponuke sú Možnosti Zavedenia systému:</para><itemizedlist><listitem><para>F1 - Pomoc. Vysvetľuje možnosti "splash", "apm", "acpi" a "Ide"</para></listitem><listitem><para>F2 - Jazyk. Vyberte si pre zobrazenie jazyka obrazoviek.</para></listitem><listitem><para>F3 - Rozlíšenie obrazovky. Voľba medzi textom, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom alebo Ďalšie. Normálne sa inštalácia vykoná z vloženého
-inštalačného média. Tu si vyberáte iné zdroje, akými sú FTP alebo NFS
-servery. Ak sa inštalácia vykonáva v sieti so SLP serverom, pri tejto
-možnosti si vyberte jeden z inštalačných zdrojov dostupných na serveri.</para></listitem><listitem><para>F5 - Ovládač. Áno alebo Nie. Systém je upovedomený o prítomnosti voliteľného
-disku s aktualizáciou ovládača a bude požadovať jeho vloženie počas procesu
-inštalácie.</para></listitem><listitem><para>F6 - Voľby jadra. Toto je cesta pre zadanie volieb vzťahujúcich sa k vášmu
-hardvéru a ovládačom, ktoré sa použijú.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">V UEFI režime</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Prvá obrazovka počas štartu na UEFI systémoch z disku</para></caption></mediaobject><para>Tu máte len možnosť spustiť Mageiu v Živom režime (prvá voľba) alebo spustiť
-inštaláciu (druhá voľba).</para><para>Ak ste naštartovali počítač z USB kľúča, dostanete dva doplňujúce riadky,
-ktoré sú duplikáty predošlých riadkov zakončené so skratkou "USB". Máte ich
-na výber.</para><para>V každom prípade budú prvé kroky rovnaké - vybrať si jazyk, časovú zónu a
-klávesnicu; potom sa postupy odlišujú v <link linkend="testing">dodatočných
-krokoch v Živom režime</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Zaviesť Mageiu ako Živý systém</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Zavedenie z dátového nosiča</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">V zastaralom BIOS/CSM režime</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Prvá obrazovka počas spúšťania v BIOSovom režime</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">V UEFI režime</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/sk/chooseDesktop.xml b/docs/docs/stable/installer/sk/chooseDesktop.xml
index 2f9eba89..8f302a19 100644
--- a/docs/docs/stable/installer/sk/chooseDesktop.xml
+++ b/docs/docs/stable/installer/sk/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sk" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Výber pracovného prostredia</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Výber pracovného prostredia</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide-show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> or <application>GNOME</application>
-desktop environment. Both come with a full set of useful applications and
-tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
-use both), or if you want to modify the default software choices for these
-desktop environments. The <application>LXDE</application> desktop, for
-instance, is lighter than the previous two, sporting less eye candy and
-fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/sk/choosePackageGroups.xml b/docs/docs/stable/installer/sk/choosePackageGroups.xml
index 5ea2baba..b31ddef6 100644
--- a/docs/docs/stable/installer/sk/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/sk/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sk" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sk" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Výber skupín balíkov</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/sk/choosePackagesTree.xml b/docs/docs/stable/installer/sk/choosePackagesTree.xml
index 3de184b9..8e631fce 100644
--- a/docs/docs/stable/installer/sk/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/sk/choosePackagesTree.xml
@@ -1,21 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="sk">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="sk">
   <info>
     <title xml:id="choosePackagesTree-ti1">Výber jednotlivých balíčkov</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-  <para>Po učinení vášho výberu, môžete kliknúť na <guibutton>ikonu
-diskety</guibutton> naspodku stránky pre uloženie vášho výberu balíčkov
-(funguje i uloženie na USB kľúč). Potom môžete použiť tento súbor k
-nainštalovaniu rovnakých balíčkov na inom systéme, stlačením rovnakého
-tlačidla počas inštalácie a zvolením načítania ho.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/configureServices.xml b/docs/docs/stable/installer/sk/configureServices.xml
index bee69dfb..5aaca7fa 100644
--- a/docs/docs/stable/installer/sk/configureServices.xml
+++ b/docs/docs/stable/installer/sk/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sk" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="sk" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Nastavenie služieb</title>
   </info>
@@ -7,20 +7,31 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose are usually good.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">Ak rozsvietite službu, niektoré informácie o nej sa ukážu v informačnom poli
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Ak rozsvietite službu, niektoré informácie o nej sa ukážu v informačnom poli
 nižšie.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Veci meňte len vtedy, keď veľmi dobre viete, čo robíte.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/configureTimezoneUTC.xml b/docs/docs/stable/installer/sk/configureTimezoneUTC.xml
index f047430f..9be2c8e8 100644
--- a/docs/docs/stable/installer/sk/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/sk/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="sk">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="sk">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Nastavenie časového pásma</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the
-same time-zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
 or to GMT, also known as UTC.</para>
diff --git a/docs/docs/stable/installer/sk/configureX_card_list.xml b/docs/docs/stable/installer/sk/configureX_card_list.xml
index c349a592..17c2413d 100644
--- a/docs/docs/stable/installer/sk/configureX_card_list.xml
+++ b/docs/docs/stable/installer/sk/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="sk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Výber X Servera (Konfigurácia vašej grafickej karty)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX má veľmi rozsiahlu databázu grafických kariet a zvyčajne správne
 identifikuje video zariadenie.</para>
@@ -29,33 +42,34 @@ identifikuje video zariadenie.</para>
   <para>Ak vaša grafická karta nie je správne rozpoznaná inštalačným programom a vy
 viete, akú máte kartu, môžete ju vybrať zo stromu: <itemizedlist>
       <listitem>
-        <para>dodávateľ</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>potom názov vašej karty</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>a typ vašej karty</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-<emphasis role="bold">Xorg</emphasis> category, which provides more than 40
-generic and open source video card drivers. If you still can't find a
-specific driver for your card there is the option of using the <emphasis
-role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the <emphasis role="bold">Command-line</emphasis> Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the <emphasis role="bold">Nonfree</emphasis>
-repository and in some cases only from the card manufacturers' websites.</para>
-
-  <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be
-explicitly enabled to access them. If you didn't enable it previously, you
-should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/sk/configureX_chooser.xml b/docs/docs/stable/installer/sk/configureX_chooser.xml
index fde7e945..ad23d833 100644
--- a/docs/docs/stable/installer/sk/configureX_chooser.xml
+++ b/docs/docs/stable/installer/sk/configureX_chooser.xml
@@ -1,62 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="sk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Nastavenie grafickej karty a monitoru</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym> or any other graphical environment to work well, the
-following <acronym>X</acronym> settings need to be correct. Choose the
-correct settings if none are shown, or if you think the details are
-incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Grafická karta</guibutton></emphasis>: Vyberte zo
-zoznamu vašu kartu, ak je to treba.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from
-the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose
-<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and
-vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Nesprávne obnovovacie frekvencie môžu zničiť váš monitor</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and
-color depth of your monitor can be set here.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the option is there, and you test your
-settings, you should be ask whether your settings are correct. If you answer
-<emphasis role="bold">yes</emphasis>, the settings will be kept. If you
-don't see anything, you'll return to the configuration screen and be able to
-reconfigure everything until the test result is satisfactory. If the test
-option is not available, then make sure your settings are on the safe side.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Možnosti</guibutton></emphasis>: Tu si môžete vybrať,
-či povoliť alebo zakázať rôzne možnosti.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/sk/configureX_monitor.xml b/docs/docs/stable/installer/sk/configureX_monitor.xml
index 53b38a55..fa1df415 100644
--- a/docs/docs/stable/installer/sk/configureX_monitor.xml
+++ b/docs/docs/stable/installer/sk/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="sk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,64 +23,82 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Výber vášho monitoru</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX má veľmi rozsiahlu databázu monitorov a zvyčajne správne identifikuje
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX má veľmi rozsiahlu databázu monitorov a zvyčajne správne identifikuje
 ten váš.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
 could damage your monitor or video hardware. Please don't try something
 without knowing what you are doing.</emphasis> If in doubt you should
 consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Vlastné</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Vlastný výber</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Táto možnosť vám dovoľuje nastaviť dva kritické parametre, vertikálnu
-obnovovaciu frekvenciu a horizontálnu synchronizačnú frekvenciu. Vertikálne
-obnovovanie určuje, ako často je obrazovka obnovovaná a horizontálna
-synchronizácie je rýchlosť, ktorou sú zobrazované skenované riadky.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">Je <emphasis>VEĽMI DÔLEŽITÉ</emphasis> aby ste nezvolili typ monitora s
+        <para revision="1" xml:id="configureX_monitor-pa4">Je <emphasis>VEĽMI DÔLEŽITÉ</emphasis> aby ste nezvolili typ monitora s
 rozsahom synchronizácie, ktorý presahuje schopnosti vášho monitora: mohli by
 ste tým poškodiť svoj monitor. Ak ste v pochybnostiach, vyberte si
 konzervatívne nastavenie a preverte ho v dokumentácii k vášmu monitoru.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">Toto je predvolená možnosť, ktorá vyskúša určiť typ monitora z databázy
-monitorov.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Dodávateľ</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">Ak inštalátor korektne nerozpoznal váš monitor a vy viete, ktorý máte,
-môžete si ho zvoliť zo stromu pomocou výberu: <itemizedlist>
       <listitem>
-        <para>dodávateľ</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>mena výrobcu monitora</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>popisu monitora</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Ak inštalátor korektne nerozpoznal váš monitor a vy viete, ktorý máte,
+môžete si ho zvoliť zo stromu pomocou výberu:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Všeobecný</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the <emphasis
-role="bold">Vesa</emphasis> card driver when your video hardware cannot be
-determined automatically. Once again it may be wise to be conservative in
-your selections.</para>
-</section>
\ No newline at end of file
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/sk/diskPartitioning.xml b/docs/docs/stable/installer/sk/diskPartitioning.xml
new file mode 100644
index 00000000..6b190123
--- /dev/null
+++ b/docs/docs/stable/installer/sk/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="sk" version="5.0" xml:lang="sk">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/diskdrake.xml b/docs/docs/stable/installer/sk/diskdrake.xml
index 48ca8fc4..030a6949 100644
--- a/docs/docs/stable/installer/sk/diskdrake.xml
+++ b/docs/docs/stable/installer/sk/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sk" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Vlastné rozdelenie disku pomocou DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis>
-partition you must ensure that you have a separate <emphasis
-role="bold">/boot</emphasis> partition. The encryption option for the
-<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise
-your system will be unbootable.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view their details before you start.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage
-device like a USB key). In the screen-shot above there are two available
-devices: <emphasis role="bold">sda </emphasis>and <emphasis
-role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if
-you are sure you want to wipe all partitions on the selected storage device.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Expert mode</guibutton> provides more options such as a label
-(give a name to) a partition, or to choose a partition type.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Kliknite na tlačidlo <guibutton>Hotovo</guibutton>, keď ste nachystaní.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
-Partition) is present and correctly mounted on /boot/EFI (see below)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/sk/doPartitionDisks.xml b/docs/docs/stable/installer/sk/doPartitionDisks.xml
index 8fe73278..6ff2c940 100644
--- a/docs/docs/stable/installer/sk/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/sk/doPartitionDisks.xml
@@ -1,171 +1,213 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sk" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Rozdelenie diskov</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the
-DrakX partitioning proposals for where to install
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the
-layout and content of your particular hard drive(s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Použiť existujúce partície</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">Ak je dostupná táto možnosť, potom boli nájdené jestvujúce s Linuxom
+      <para revision="1" xml:id="doPartitionDisks-pa5">Ak je dostupná táto možnosť, potom boli nájdené jestvujúce s Linuxom
 kompatibilné partície a môžu byť použité pre inštaláciu.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Použiť voľné miesto</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">Ak máte nevyužité miesto na vašom pevnom disku, potom ho táto možnosť
+      <para revision="1" xml:id="doPartitionDisks-pa7">Ak máte nevyužité miesto na vašom pevnom disku, potom ho táto možnosť
 využije pre vašu novú inštaláciu Mageie.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Použiť voľné miesto na Windowsovej partícii</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">Ak máte nevyužité miesto na existujúcej Windowsovej partícii, inštalátor
-môže ponúknuť jeho použitie.</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">Toto môže byť užitočná cesta vytvorenia priestoru pre vašu novú inštaláciu
-Mageie, ale je to riziková operácia, takže by ste sa mali uistiť, že máte
-zazálohované všetky dôležité súbory!</para>
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Pamätajte, že toto znamená zmenšenie veľkosti Windowsovej partície. Partícia
 musí byť "čistá", to znamená že Windows museli byť korektne vypnuté, keď
 boli naposledy použité. Tiež musela byť defragmentovaná, hoci toto nie je
 zárukou, že všetky súbory na partícii boli presunuté z oblasti, ktorá má byť
 použitá. Vysoko sa odporúča zazálohovať si vaše osobné súbory.</para>
+      </important>
+    </listitem>
 
-        <para>With this option, the installer displays the remaining Windows partition in
-light blue and the proposed Mageia partition in dark blue with their
-intended sizes just underneath. You have the option to modify these sizes by
-clicking and dragging the gap between both partitions. See the following
-screen-shot.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Vymazať a použiť Celý Disk.</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">This option will allocate the entire drive for Mageia.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Upozornenie! Toto vymaže VŠETKY dáta na vybranom pevnom disku. Teda buďte
-opatrní!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">Toto vám dáva úplnú kontrolu nad umiestnením inštalácie na vašom pevnom
+disku (resp. diskoch).</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">Ak zamýšľate použiť čas disku pre niečo iné, alebo už máte dáta na onom
-disku, ktoré nie ste pripravení stratiť, potom nepoužívajte túto voľbu.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Custom disk partitioning</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">Toto vám dáva úplnú kontrolu nad umiestnením inštalácie na vašom pevnom
-disku (resp. diskoch).</para>
-      </listitem>
-    </itemizedlist></para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para>If you are not using the <emphasis role="bold">Custom disk
-partitioning</emphasis> option, the installer will allocate the available
-space according to the following rules:</para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>If the total available space is less than 50 GB, then only one partition is
-created. This will be the <emphasis role="bold">/</emphasis> (root)
-partition.</para>
-      </listitem>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-      <listitem>
-        <para>If the total available space is greater than 50 GB, then three partitions
-are created</para>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 of the total available place is allocated to <emphasis
-role="bold">/</emphasis> with a maximum of 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 je pridelená pre swap , nanajvýš však 4 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>the rest (at least 12/19) is allocated to <emphasis
-role="bold">/home.</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-  <para>That means that from 160 GB or greater available space, the installer will
-create three partitions: 50 GB for <emphasis role="bold">/</emphasis>, 4 GB
-for <emphasis role="bold">swap</emphasis> and the remainder for <emphasis
-role="bold">/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
-automatically detected - or created if it does not exist yet, and mounted on
-/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to
-create a BIOS boot partition if not already existing. It is a roughly 1 MiB
-partition with no mount point. Choose <xref linkend="diskdrake"/> to be able
-to create it with the Installer like any other partition, just select BIOS
-boot partition as the filesystem type.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512. Due to lack of available hardware, the
 partitioning tool used in the installer has not been tested with such a
-drive. Also some SSD devices now use an erase block size over 1 MB. If you
-have such a device we suggest that you partition the drive in advance, using
-an alternative partitioning tool like <emphasis
-role="bold">gparted</emphasis>, and to use the following settings:</para>
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/sk/exitInstall.xml b/docs/docs/stable/installer/sk/exitInstall.xml
index 52bf6c41..3f140620 100644
--- a/docs/docs/stable/installer/sk/exitInstall.xml
+++ b/docs/docs/stable/installer/sk/exitInstall.xml
@@ -5,22 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">Dokončili ste inštaláciu a konfiguráciu <application>Mageie</application> a
-teraz je bezpečné vybrať inštalačné médium a reštartovať váš počítač.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems (if there are more than one) on your computer.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">Ak ste neupravovali nastavenia pre zavádzač systému, automaticky bude
 vybraná a spustená vaša nainštalovaná Mageia.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Nech sa vám páči!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Navštívte www.mageia.org ak máte nejaké otázky alebo ak chcete prispieť k
-Mageii</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/firewall.xml b/docs/docs/stable/installer/sk/firewall.xml
index d07af6f0..5400221a 100644
--- a/docs/docs/stable/installer/sk/firewall.xml
+++ b/docs/docs/stable/installer/sk/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="sk">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="sk" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Firewall</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Firewall</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
   <para>In the default setting (no button is checked), no service of the system is
-accessible from the network. The <emphasis role="bold">Everything (no
-firewall)</emphasis> enables access to all services of the machine - an
-option that does not make much sense in the context of the installer since
-it would create a totally unprotected system. Its veritable use is in the
-context of the Mageia Control Center (which uses the same GUI layout) for
-temporarily disabling the entire set of firewall rules for testing and
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
 debugging purposes.</para>
 
   <para>All other options are more or less self-explanatory. As an example, you will
-enable the <emphasis role="bold">CUPS server</emphasis> if you want printers
-on your machine to be accessible from the network.</para>
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where
-you can enable a series of services by typing a list of couples (blank
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
diff --git a/docs/docs/stable/installer/sk/formatPartitions.xml b/docs/docs/stable/installer/sk/formatPartitions.xml
index bcfe3195..7ae7dc9e 100644
--- a/docs/docs/stable/installer/sk/formatPartitions.xml
+++ b/docs/docs/stable/installer/sk/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="sk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formátovanie</title>
   </info>
@@ -11,33 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
 partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Zvyčajne prinajmenšom partície, ktoré DrakX vybral, potrebujú byť
-naformátované.</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Kliknite na <guibutton>Pokročilé</guibutton> pre výber partícií, ktoré
-chcete skontrolovať na takzvané <emphasis>chybné bloky</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen,
-where you can choose to view details of your partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">Ak ste spokojný s výberom, kliknite na <guibutton>Ďalej</guibutton> pre
-pokračovanie.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/sk/graphicalConfiguration.xml b/docs/docs/stable/installer/sk/graphicalConfiguration.xml
new file mode 100644
index 00000000..cb3f4afe
--- /dev/null
+++ b/docs/docs/stable/installer/sk/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/sk/installUpdates.xml b/docs/docs/stable/installer/sk/installUpdates.xml
index 8bd654e7..d378041c 100644
--- a/docs/docs/stable/installer/sk/installUpdates.xml
+++ b/docs/docs/stable/installer/sk/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="sk">
-  <info>
-    <title xml:id="installUpdates-ti1">Aktualizácie</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Aktualizácie</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Odkedy bola uvoľnená táto verzia o.s. <application>Mageia</application>,
-niektoré balíčky boli aktualizované alebo vylepšené.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them,
-select <guilabel>No</guilabel> if you don't want to do this now, or if you
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
 aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Press <guibutton>Next</guibutton> to continue</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/installer.xml b/docs/docs/stable/installer/sk/installer.xml
index 029a54fa..911e1c87 100644
--- a/docs/docs/stable/installer/sk/installer.xml
+++ b/docs/docs/stable/installer/sk/installer.xml
@@ -6,165 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, inštalátor Mageie</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, inštalátor Mageie</title>
   </info>
 
   <para>Či už ste nováčikom u GNU-Linuxu alebo pokročilým používateľom, Mageia
 inštalátor je navrhnutý, aby vám pomohol učiniť vašu inštaláciu alebo
 aktualizáciu čo najľahšou ako sa len dá.</para>
 
-  <para>Počiatočná ponuková obrazovka má rôzne možnosti, každopádne predvolená
-spustí inštalátor, ktorý bude zvyčajne všetko, čo potrebujete.</para>
+  <section>
+    <title>Kroky inštalácie</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Uvítacia inštalačná obrazovka</title>
 
-    <section>
-      <title>Using a Mageia DVD</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>From this screen, you have access to options by pressing "<emphasis
-role="bold">e</emphasis>" to enter the edit mode. To come back to this
-screen, press either <emphasis role="bold">Esc</emphasis> key to quit
-without saving or press the key <emphasis role="bold">Ctrl</emphasis> or
-<emphasis role="bold">F10</emphasis> to quit with saving.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, it is possible to set some preferences (note that the
-options <emphasis role="bold">F1</emphasis> to <emphasis
-role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist>
-          <listitem>
-            <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis
-role="bold">F6</emphasis> options, you can view relevant help by pressing
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a
-specific language for the installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>If needed, change the screen resolution by pressing <emphasis
-role="bold">F3</emphasis> (Legacy mode only).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis role="bold">F6</emphasis> <emphasis
-role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis
-role="bold">e</emphasis> instead).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Default: It doesn't alter anything in the default options.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: Priority is given to the safer options at the price of a
-performance detriment.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI: (Advanced Configuration and Power Interface): Power management
-features are not used.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU
-interrupt. Select this option if you experience system misbehaviour like a
-kernel panic in relation to APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>Keď si vyberiete jednu z týchto položiek, ona modifikuje predvolené možnosti
-zobrazené v riadku <guilabel>Možnosti zavádzania systému</guilabel>.</para>
-
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with
-<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot
-Options</guilabel> line, despite this, they will in fact be applied.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various
-boot options. Select an item with the arrow keys and press <emphasis
-role="bold">Enter</emphasis> for more details or press <emphasis
-role="bold">Esc</emphasis> to go back to the welcome screen.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>The detailed view about the splash option. Press <emphasis
-role="bold">Esc</emphasis> or select <guilabel>Return to Boot
-Options</guilabel> to go back to the options list. These options can be
-added by hand in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>Pre viacej informácií o možnostiach kernelu na obstarožných a UEFI
-systémoch, pozrite: <link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>Kroky inštalácie</title>
+    <section>
+      <title>UEFI Systems</title>
 
-    <para>The install process is divided into a number of steps, the status of which
-is indicated in a panel to the left of the screen.</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
-options.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
-about the particular step.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
-is possible to reboot, but please think twice before you do this. Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -175,19 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>Po počiatočnej obrazovke vám nenabehla obrazovka výberu jazyka. Toto sa môže
-stať s niektorými grafickými kartami a staršími systémami. Skúste použiť
-nízke rozlíšenie obrazovky napísaním <code>vgalo</code> v príkazovom riadku.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this press <emphasis role="bold">Esc</emphasis> at the first welcome screen
-and confirm with <emphasis role="bold">ENTER</emphasis>. You will be
-presented with a black screen with the word "boot:". Type "text" and press
-<emphasis role="bold">ENTER</emphasis> to continue with the installation in
-text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -195,11 +195,11 @@ text mode.</para>
     <section>
       <title>Inštalácia zamrzne</title>
 
-      <para>Ak sa zdá, že systém mrzne počas inštalácie, môže to byť problém s detekciou
-hardvéru. V tomto prípade môže byť obídená automatická detekcia hardvéru a
-vykonaná neskôr. Ak chcete toto vyskúšať, napíšte <code>noauto</code> na
-príkazovom riadku. Táto možnosť môže byť tiež skombinovaná aj s inými
-možnosťami, ak je treba.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -207,17 +207,18 @@ možnosťami, ak je treba.</para>
 
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dynamické partície</title>
 
-      <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis>
-format to <emphasis role="bold">dynamic</emphasis> format in Microsoft
-Windows, then it is not possible to install Mageia on this disc. To revert
-to a basic disk, see the Microsoft documentation: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/sk/locale.xml b/docs/docs/stable/installer/sk/locale.xml
new file mode 100644
index 00000000..296aad56
--- /dev/null
+++ b/docs/docs/stable/installer/sk/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/sk/login.xml b/docs/docs/stable/installer/sk/login.xml
index 88f5f518..c61c8eb5 100644
--- a/docs/docs/stable/installer/sk/login.xml
+++ b/docs/docs/stable/installer/sk/login.xml
@@ -1,7 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="sk"><info><title xml:id="label-to-adapt-ti1">Prihlasovacia obrazovka</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM prihlasovacia obrazovka</para></caption></mediaobject><para>Nakoniec sa dostanete ku prihlasovacej obrazovke</para><para>Vložte vaše používateľské meno a používateľské heslo a za pár sekúnd sa
-ocitnete na načítanej KDE alebo GNOME pracovnej ploche, podľa toho ktorý
-živý dátový nosič ste použili. Teraz môžete začať používať vašu inštaláciu
-Mageie.</para><para>Ďalšiu časť našej dokumentácie môžete nájsť na <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">Mageia
-wiki</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="sk">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/media_selection.xml b/docs/docs/stable/installer/sk/media_selection.xml
index 89838b65..bef5a97f 100644
--- a/docs/docs/stable/installer/sk/media_selection.xml
+++ b/docs/docs/stable/installer/sk/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="sk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Výber nosiča (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Tu máte zoznam dostupných repozitárov. Nie všetky repozitáre sú dostupné,
 podľa toho ktoré médium používate pre inštaláciu. Výber repozitárov určuje,
@@ -31,11 +40,11 @@ obsahuje základ distribúcie.</para>
     </listitem>
 
     <listitem>
-      <para>Repozitár pre <emphasis>Nonfree</emphasis> softvér obsahuje balíčky, ktoré
-sú voľne bez poplatkov, napr. Mageia ich môže redistribuovať, ale ony
-obsahujú softvér s neverejným zdrojovým kódom (stadiaľ ono pomenovanie
-Nonfree - neslobodný). Napríklad tento repozitár obsahuje proprietárne
-ovládače pre grafické karty nVidia a ATI, firmvér pre rôzne WiFi karty, atď.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/sk/minimal-install.xml b/docs/docs/stable/installer/sk/minimal-install.xml
index d4a389e5..b7ab88dd 100644
--- a/docs/docs/stable/installer/sk/minimal-install.xml
+++ b/docs/docs/stable/installer/sk/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="sk">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="sk">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Minimálna inštalácia</title>
   </info>
@@ -10,30 +13,44 @@
 
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
-  <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+  
 
-  <para>Minimal Installation is intended for those with specific uses in mind for
-<application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the <emphasis
-role="bold">Individual package selection</emphasis> option mentioned above,
-to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>If you choose this installation method, then the relevant screen will offer
-you a few useful extras to install, such as documentation and X.</para>
+  
 
-  <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
 lightweight desktop environment) will also be included.</para>
-
-  <para>Základná dokumentácia je poskytnutá vo forme man a informačných
-stránkach. Obsahuje man stránky z <link
-xlink:href="http://www.tldp.org/manpages/man.html">Linuxového dokumentačného
-projektu</link> a informačné stránky o <link
-xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU jadrových
-utilitách</link>.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
+xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
+Project</link> and the <link
+xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
+coreutils</link> info pages.</para>
 
   <mediaobject>
 <imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
diff --git a/docs/docs/stable/installer/sk/misc-params.xml b/docs/docs/stable/installer/sk/misc-params.xml
index 87fd7e18..1c567d16 100644
--- a/docs/docs/stable/installer/sk/misc-params.xml
+++ b/docs/docs/stable/installer/sk/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sk" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Súhrn o rozličných parametroch</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
 
   <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
 the choices you made and on the hardware detected. You can check the
 settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>As a general rule, it is recommended that you accept the default settings
@@ -26,7 +42,7 @@ unless:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>some other factor mentionned in the detailed sections below is an issue.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,46 +54,47 @@ unless:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Časové pásmo</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
 can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Krajina / Región</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
 setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Zavádzač</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX spravil dobré výbery pre nastavenie zavádzača systému.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Pre viac informácií, viď <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Správa používateľov</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Tu môžete pridať extra používateľov. Každý z nich obdrží svoj vlastný
-<literal>/home</literal> t. j. domáce adresáre.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Služby</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
 (daemons).  This tool allows you to enable or disable certain processes.</para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Tu by ste mali škrtať opatrne, skôr než tu čokoľvek zmeníte - omyl môže
-zabrániť správnemu behu vášho počítača.</para>
-
-        <para>Pre viac informácií, viď <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -89,7 +106,7 @@ zabrániť správnemu behu vášho počítača.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Klávesnica</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
 of keyboard.</para>
@@ -101,28 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Myš</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Tu môžete pridávať alebo konfigurovať ďalšie ukazovacie zariadenia, tablety,
 trackbally atď.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Zvuková karta</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The
-option to select a different driver is only given when there is more than
-one driver for your card, but where none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Grafické rozhranie</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Táto sekcia vám dovoľuje konfigurovať vašu grafickú kartu (resp. karty) a
-obrazovky.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Pre viac informácií, viď <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -137,11 +158,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Sieť</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, using the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
@@ -151,14 +172,14 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxy servery</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server slúži ako sprostredkovateľ medzi vaším počítačom a širším
-internetom. Táto sekcia vám dovoľuje konfigurovať váš počítač pre využitie
-niektorej proxy služby.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -170,28 +191,31 @@ need to enter here.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Úroveň bezpečnosti</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Tu nastavujete Úroveň bezpečnosti pre váš počítač, vo väčšine prípadov
-predvolené nastavenie (Štandardná) je adekvátna pre bežné použitie.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Zaškrtnite voľbu, ktorá sa najlepšie hodí k vášmu používaniu.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Firewall</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">Firewall, slovenský ohnivá stena, má slúžiť ako bariéra medzi vašimi
-dôležitými dátami a ničomníkmi vonku na internete, ktorí by ich chceli
-rozširovať alebo ukradnúť.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Majte na pamäti, že dovolenie všetkého (žiaden firewall) môže byť veľmi
-riskantné.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/sk/reboot.xml b/docs/docs/stable/installer/sk/reboot.xml
index e3501d1e..977a75b5 100644
--- a/docs/docs/stable/installer/sk/reboot.xml
+++ b/docs/docs/stable/installer/sk/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="sk" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Reštart</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/sk/securityLevel.xml b/docs/docs/stable/installer/sk/securityLevel.xml
index d0b217af..a1eeb000 100644
--- a/docs/docs/stable/installer/sk/securityLevel.xml
+++ b/docs/docs/stable/installer/sk/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sk" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Úroveň bezpečnosti</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended
-setting for the average user. The <emphasis role="bold">Secure</emphasis>
-setting will create a highly protected system - for instance if the system
-is to be used as a public server.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Security Administrator</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
 which require notification to a system administrator.</para>
 
-  <para>A good, and easy-to-implement, choice is to enter &lt;user>@localhost -
-where &lt;user> is the login name of the user to receive these messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
 be configured for receiving such mail!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/sk/selectCountry.xml b/docs/docs/stable/installer/sk/selectCountry.xml
index 6d1a17e2..2b2c800f 100644
--- a/docs/docs/stable/installer/sk/selectCountry.xml
+++ b/docs/docs/stable/installer/sk/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="sk">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="sk">
   <info>
     <title xml:id="selectCountry-ti1">Vyberte si vašu Krajinu / Región</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> option and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem that a country from the
-first list was chosen. Please ignore this, as DrakX will apply your actual
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,7 +40,7 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Vstupná metóda</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
@@ -39,9 +50,9 @@ selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via <emphasis role="bold">Configure
-your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
-running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/selectInstallClass.xml b/docs/docs/stable/installer/sk/selectInstallClass.xml
index ded15478..20d71b7e 100644
--- a/docs/docs/stable/installer/sk/selectInstallClass.xml
+++ b/docs/docs/stable/installer/sk/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="sk" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Inštalovanie alebo Aktualizovanie</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Inštalovanie</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option to perform a fresh installation of
-<application>Mageia</application>. This will format the root partition (/),
-but can preserve a separated /home partition.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Aktualizovanie</para>
-
-      <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that has reached
-its End Of Life, then it is better to do a clean install instead while
-preserving your <literal>/home</literal> partition.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that, and only if you are very sure
-rebooting is what you want, go to a text terminal by pressing <guilabel>Alt
-Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the <emphasis role="bold">Install or Upgrade</emphasis>
-screen to the language choice screen by pressing <guilabel>Alt Ctrl
-Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do
-this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sk/selectKeyboard.xml b/docs/docs/stable/installer/sk/selectKeyboard.xml
index f35b1e9b..88c3b5bc 100644
--- a/docs/docs/stable/installer/sk/selectKeyboard.xml
+++ b/docs/docs/stable/installer/sk/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="sk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,19 +19,22 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Klávesnica</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX vyberie vhodnú klávesnicu pre váš jazyk. Ak nebola nájdená žiadna
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX vyberie vhodnú klávesnicu pre váš jazyk. Ak nebola nájdená žiadna
 vhodná klávesnica, bude predvolené rozloženie kláves americkej klávesnice.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Uistite sa, že výber je správny alebo si vyberte iné rozloženie
+      <para revision="1" xml:id="selectKeyboard-pa2">Uistite sa, že výber je správny alebo si vyberte iné rozloženie
 klávesnice. Ak neviete, ktoré rozloženie má vaša klávesnica, pozrite sa do
 špecifikácií, ktoré prišli s vaším systémom, alebo sa spýtajte počítačového
 dodávateľa. Na klávesnici môže byť dokonca i štítok, ktorý identifikuje
@@ -27,23 +43,22 @@ xlink:href="https://cs.wikipedia.org/wiki/Rozlo%C5%BEen%C3%AD_kl%C3%A1ves">cs.wi
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a fuller list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this and
-continue the installation: the keyboard chosen from the full list will be
-applied.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
 extra dialogue screen asking how you would prefer to switch between the
 Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sk/selectKeyboardLive.xml b/docs/docs/stable/installer/sk/selectKeyboardLive.xml
index 5f7691aa..3b8b245c 100644
--- a/docs/docs/stable/installer/sk/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/sk/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sk" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Vyberte si klávesnicu</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>Budete si musieť vybrať rozloženie klávesnice, ktoré si prajete používať v
-Mageii. Predvolená je vybraná primerane k vášmu jazyku a predošlej vybranej
-časovej oblasti.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/sk/selectLanguage.xml b/docs/docs/stable/installer/sk/selectLanguage.xml
index c7ddf8bb..b71618b7 100644
--- a/docs/docs/stable/installer/sk/selectLanguage.xml
+++ b/docs/docs/stable/installer/sk/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sk" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,50 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Prosím, zvoľte jazyk, ktorý chcete používať</title>
   </info>
 
-  <para condition="classical">Vyberte si váš obľúbený jazyk, tým že najprv rozbalíte zoznam pre váš
-svetadiel. <application>Mageia</application> použije tento výber počas
-inštalácie a pre váš inštalovaný systém.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">If it is likely that you (or others) will require several languages to be
-installed on your system, then you should use the <guibutton>Multiple
-languages</guibutton> option to add them now. It will be difficult to add
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
 extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
+  <important condition="classical">
     <para>Even if you choose more than one language, you must first choose one as your
-preferred language in the first language screen. It will also be marked as
-chosen in the multiple languages screen.</para>
-  </warning>
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
-      <para>Ak jazyk vašej klávesnice nie je ten istý ako váš prednostný jazyk, potom sa
-odporúča nainštalovať takisto jazyk vašej klávesnice.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia používa predvolene UTF-8 (Unicode) podporu.</para>
-
-      <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple
-languages</emphasis> screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>Jazyk vášho systému po inštalácii môžete zmeniť v ponuke Mageia Ovládacie
-Centrum -> Systém -> Spravovať lokalizáciu pre váš systém.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sk/selectMouse.xml b/docs/docs/stable/installer/sk/selectMouse.xml
index 53a75e20..9f6ce396 100644
--- a/docs/docs/stable/installer/sk/selectMouse.xml
+++ b/docs/docs/stable/installer/sk/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="sk">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Výber myši</title>
   </info>
@@ -7,25 +13,28 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Ak nie ste spokojní s odozvou vašej myši, tu si môžete vybrať odlišnú myš.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Zvyčajne je <guilabel>Univerzálna</guilabel> - <guilabel>Hocaká
-PS/2</guilabel> a <guilabel>USB myš</guilabel> je dobrou voľbou.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Vyberte <guilabel>Univerzálna</guilabel> - <guilabel>Vynútiť
-evdev</guilabel> pre nakonfigurovanie tlačidiel, ktoré nefungujú na myši
-majúcej šesť alebo viac tlačidiel.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/sk/setupBootloader.xml b/docs/docs/stable/installer/sk/setupBootloader.xml
index 93eb810c..93e8da87 100644
--- a/docs/docs/stable/installer/sk/setupBootloader.xml
+++ b/docs/docs/stable/installer/sk/setupBootloader.xml
@@ -1,146 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="sk" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="sk" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Hlavné parametre zavádzača</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Bootloader interface</title>
-    <para>By default, Mageia uses exclusively:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot
-choose between the <emphasis role="bold">with</emphasis> or <emphasis
-role="bold">without graphical menu</emphasis> options.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to house the bootloader
-(GRUB2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds GRUB2-efi. Although it is possible to have
-several ESPs, only one is required (and advised), whatever the number of
-operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Použitie zavádzača Mageie</title>
-    <para>By default, and according to your system, Mageia writes one of the
-following:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then untick the <emphasis
-role="bold">Probe Foreign OS</emphasis> option.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
   <section>
-    <title>Použitie už existujúceho zavádzača</title>
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this documentation, however in most cases it will
-involve running the relevant bootloader installation program which should
-detect and add it automatically. See the documentation for the operating
-system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Options</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>First page</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you
-set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be required when booting
-to select a booting entry or change settings. The username is <emphasis
-role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will
-check that it matches with the one above.</para></listitem><listitem><para><guilabel>Advanced</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for power management. It can save energy by
-stopping unused devices.  Deselecting it could be useful if, for example,
-your computer does not support ACPI or if you think the ACPI implementation
-might cause some problems (for instance random reboots or system lockups).</para></listitem><listitem><para><guilabel>Enable SMP</guilabel>: This option enables/disables symmetric
-multiprocessing for multi core processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the operating system access to
-the Advanced Programmable Interrupt Controller. APIC devices permit more
-complex priority models, and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC manages all external
-interrupts for a specific processor in an SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Hlavné parametre zavádzača</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Next page</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-to be used by the boot menu. If you click the down triangle you will be
-offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Použitie už existujúceho zavádzača</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Pridanie alebo úprava položiek Ponuky na zavedenie systému</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/setupSCSI.xml b/docs/docs/stable/installer/sk/setupSCSI.xml
index 774ea93f..3078d08f 100644
--- a/docs/docs/stable/installer/sk/setupSCSI.xml
+++ b/docs/docs/stable/installer/sk/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="sk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Nastavenie SCSI</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,16 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
 SCSI controllers it may be unable to determine the correct drivers to use
 and subsequently fail to recognise the drive.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s)
-you have.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">DrakX by potom mal byť schopný nakonfigurovať ono zariadenie (alebo
-zariadenia) korektne.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/sk/software.xml b/docs/docs/stable/installer/sk/software.xml
new file mode 100644
index 00000000..3252815e
--- /dev/null
+++ b/docs/docs/stable/installer/sk/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="sk" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sk/soundConfig.xml b/docs/docs/stable/installer/sk/soundConfig.xml
index 83bb8447..4a2cae66 100644
--- a/docs/docs/stable/installer/sk/soundConfig.xml
+++ b/docs/docs/stable/installer/sk/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="sk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Konfigurácia zvuku</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if one exists.</para>
+  
 
-  <para>Predvolený ovládač by mal pracovať bez problémov. Avšak, ak po inštalácií sa
-stretávate s problémami, potom spustite príkaz <command>draksound</command>
-alebo spustite tento nástroj cez ponuku MCC (Ovládacie Centrum Mageia),
-zvolením panela <guilabel>Hardvér</guilabel> a kliknutím na
-<guilabel>Konfigurácia zvuku</guilabel> v hornej pravej časti obrazovky.</para>
+  
 
-  <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis
-role="bold">Sound Configuration</emphasis> tool screen, click on
-<guibutton>Troubleshooting</guibutton> to find useful advice about how to
-solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Rozšírené</title>
     </info>
 
-    <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in
-this screen, during install, is useful if there is no default driver and
-there are several drivers available, but you think the installer selected
-the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on <emphasis
-role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sk/takeOverHdConfirm.xml b/docs/docs/stable/installer/sk/takeOverHdConfirm.xml
index 7f370b17..23003be1 100644
--- a/docs/docs/stable/installer/sk/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/sk/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="sk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Potvrdenie naformátovania pevného disku</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is
-ok to erase every partition, every operating system and all data that might
-be on that hard disk.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/sk/testing.xml b/docs/docs/stable/installer/sk/testing.xml
index 7a64b08c..5a75aebd 100644
--- a/docs/docs/stable/installer/sk/testing.xml
+++ b/docs/docs/stable/installer/sk/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Vyskúšanie Mageie ako Živého systému</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Vyskúšanie Mageie ako Živého systému</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,21 +17,20 @@
       <title xml:id="testing1-ti1">Živý režim</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>Túto obrazovku dostanete, ak ste si vybrali "Zaviesť Mageiu". Ak nie, tak
-dostanete krok "<link linkend="doPartitionDisks">Rozdelenie disku</link>"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Testovanie hardvéru</title>
       </info>
 
-      <para>Jeden z cieľov Živého režimu je otestovať, či je hardvér správne spravovaný
-Mageiou. Môžete skontrolovať, či všetky zariadenia majú svoj ovládač v
-sekcii Hardvér Ovládacieho Centra Mageie. Môžete otestovať väčšinu
-aktuálnych zariadení:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -36,11 +38,7 @@ aktuálnych zariadení:</para>
         </listitem>
 
         <listitem>
-          <para>grafická karta: ak ste už videli predošlú obrazovku, tak je už OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webová kamera:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -48,7 +46,7 @@ aktuálnych zariadení:</para>
         </listitem>
 
         <listitem>
-          <para>tlačiareň: nakonfigurujte ju a vytlačte skúšobnú stránku</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -56,10 +54,13 @@ aktuálnych zariadení:</para>
         </listitem>
       </itemizedlist>
 
-      <para>Ak je to všetko pre vás OK, môžete vykonať inštaláciu. Ak nie, môžete odísť
-s tlačítkom skončiť.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>Nastavenia konfigurácie, ktoré ste tu urobili, sa zachovajú pre inštaláciu.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -67,15 +68,14 @@ s tlačítkom skončiť.</para>
         <title xml:id="testing3-ti1">Spustiť inštaláciu</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>Pre spustenie inštalácie z Mageia LiveCD alebo Live DVD na pevný disk alebo
-SSD mechaniku, jednoducho kliknite na ikonu "Inštalovať na pevný
-disk". Obdržíte túto obrazovku a potom krok pre "<link
-linkend="doPartitionDisks">Rozdelenie disku</link>" ako u priamej
-inštalácie.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/sk/uninstall-Mageia.xml b/docs/docs/stable/installer/sk/uninstall-Mageia.xml
index e6febcf7..a4a1bab6 100644
--- a/docs/docs/stable/installer/sk/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/sk/uninstall-Mageia.xml
@@ -1,30 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="sk">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sk" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Odinštalovanie Mageie</title>
   </info>
 
   
 
+  
+
   <para>If Mageia didn't convince you or you can't install it correctly - in short
 you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-  <para>After your data backup, reboot your Mageia installation DVD and select
-<emphasis role="bold">Rescue system</emphasis>, then, <emphasis
-role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
-will only have Windows, with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>In Windows to recover the space used by Mageia partitions: click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code>. You will recognize a Mageia partition
-because they are labeled <guilabel>Unknown</guilabel>, and also by their
-size and place on the disk. Right click on each of these partitions and
-select <guibutton>Delete</guibutton> to free up the space.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-  <para>Ak používate Windows XP, môžete vytvoriť novú partíciu a naformátovať ju
-(FAT32 alebo NTFS). Bude jej priradené písmeno partície.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>If you have Vista or 7, you have one more possibility, you can extend the
 existing partition that is at the left of the freed space. There are other
@@ -32,4 +45,4 @@ partitioning tools that can be used, such as <emphasis
 role="bold">gparted</emphasis>, available for both Windows and Linux. As
 always, when changing partitions, be very careful to back up anything
 important to you.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sk/unused.xml b/docs/docs/stable/installer/sk/unused.xml
index 15884fc2..594381db 100644
--- a/docs/docs/stable/installer/sk/unused.xml
+++ b/docs/docs/stable/installer/sk/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sk" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="sk">
   <info>
     <title xml:id="unused-ti1">Ponechať alebo zmazať nepoužitý materiál</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
 
-  <para>V tomto kroku inštalátor hľadá nevyužité jazykové balíčky a nevyužité
-hardvérové balíčky. Potom vám navrhne ich vymazanie. Je dobrá myšlienka
-prijať to, okrem prípadu, že pripravujete inštaláciu, ktorá má bežať na
-odlišnom hardvéri.</para>
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>Ďalším krokom je kopírovanie súborov na pevný disk. Toto zaberie niekoľko
-minút. Na konci dostanete na určitý čas prázdnu obrazovku, to je normálne.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/sl/DrakLive-cover.xml b/docs/docs/stable/installer/sl/DrakLive-cover.xml
index 71bf6dc3..2edbf294 100644
--- a/docs/docs/stable/installer/sl/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/sl/DrakLive-cover.xml
@@ -1,75 +1,103 @@
-<?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="sl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="sl" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Namestitev z Medija Live</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>januar 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Namestitev z Medija Live</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Uradna dokumentacija za Magejo</para>
+      <para role="tagline">Uradna dokumentacija za Magejo</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Besedilo in zaslonski posnetki so licencirani z CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-            </para>
-            <para>Ta navodila so bila ustvarjena s pomočjo orodja <link
+
+      <para>Besedilo in zaslonski posnetki so licencirani z CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ta navodila so bila ustvarjena s pomočjo orodja <link
 ns6:href="http://www.calenco.com">Calenco CMS</link>, ki ga je razvila firma
-<link ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-            </para>
-            <para>Napisali smo jih prostovoljci v svojem prostem času. Obrnite se na <link
+<link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Napisali smo jih prostovoljci v svojem prostem času. Obrnite se na <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">ekipo za
-dokumentiranje</link>, če jih želite izboljšati.</para> 
+dokumentiranje</link>, če jih želite izboljšati.</para>
     </cover>
   </info>
+
   <article>
     <title>Namestitev z Medija Live</title>
-       <para><note>
-          <para>Vseh prikazanih zaslonskih posnetkov ni možno videti v vsaki
+
+    <para><note>
+        <para>Vseh prikazanih zaslonskih posnetkov ni možno videti v vsaki
 namestitvi. Njihov prikaz je odvisen od strojne opreme in vaše izbire med
 namestitvijo.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/sl/DrakLive.xml b/docs/docs/stable/installer/sl/DrakLive.xml
index e9419ae1..a00ef744 100644
--- a/docs/docs/stable/installer/sl/DrakLive.xml
+++ b/docs/docs/stable/installer/sl/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="sl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="sl" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Namestitev z Medija Live</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Namestitev z Medija Live</title>
 
     <cover>
       <para><note>
@@ -16,9 +31,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link>, ki ga je razvila firma
 <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>Napisali smo jih prostovoljci v svojem prostem času. Obrnite se na <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">ekipo za
-dokumentiranje</link>, če jih želite izboljšati.</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>
 
@@ -38,7 +53,12 @@ dokumentiranje</link>, če jih želite izboljšati.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -48,17 +68,18 @@ dokumentiranje</link>, če jih želite izboljšati.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/sl/DrakX-cover.xml b/docs/docs/stable/installer/sl/DrakX-cover.xml
index 369a3913..ad4413d1 100644
--- a/docs/docs/stable/installer/sl/DrakX-cover.xml
+++ b/docs/docs/stable/installer/sl/DrakX-cover.xml
@@ -1,114 +1,153 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="sl" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="sl" xml:id="Quick-Startup"
+      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>Namestitev s programom DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Februar 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Februar 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Uradna dokumentacija za Magejo</para>
+      <para role="tagline">Uradna dokumentacija za Magejo</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>Besedilo in zaslonski posnetki so licencirani z CC BY-SA 3.0 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Ta navodila so bila ustvarjena s pomočjo orodja <link
+
+      <para>Besedilo in zaslonski posnetki so licencirani z CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ta navodila so bila ustvarjena s pomočjo orodja <link
 ns6:href="http://www.calenco.com">Calenco CMS</link>, ki ga je razvila firma
-<link ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>Napisali smo jih prostovoljci v svojem prostem času. Obrnite se na <link
+<link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Napisali smo jih prostovoljci v svojem prostem času. Obrnite se na <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">ekipo za
-dokumentiranje</link>, če jih želite izboljšati.</para> 
+dokumentiranje</link>, če jih želite izboljšati.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Namestitev s programom DrakX</title>
-       <para><note>
-          <para>Vseh prikazanih zaslonskih posnetkov ni možno videti v vsaki
+
+    <para><note>
+        <para>Vseh prikazanih zaslonskih posnetkov ni možno videti v vsaki
 namestitvi. Njihov prikaz je odvisen od strojne opreme in vaše izbire med
 namestitvijo.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -116,29 +155,32 @@ namestitvijo.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/sl/DrakX-inline.xml b/docs/docs/stable/installer/sl/DrakX-inline.xml
new file mode 100644
index 00000000..9852f360
--- /dev/null
+++ b/docs/docs/stable/installer/sl/DrakX-inline.xml
@@ -0,0 +1,137 @@
+<?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="sl" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Namestitev s programom DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>Vseh prikazanih zaslonskih posnetkov ni možno videti v vsaki
+namestitvi. Njihov prikaz je odvisen od strojne opreme in vaše izbire med
+namestitvijo.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Besedilo in zaslonski posnetki so licencirani z CC BY-SA 3.0 <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ta navodila so bila ustvarjena s pomočjo orodja <link
+ns6:href="http://www.calenco.com">Calenco CMS</link>, ki ga je razvila firma
+<link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Napisali smo jih prostovoljci v svojem prostem času. Obrnite se na <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">ekipo za
+dokumentiranje</link>, če jih želite izboljšati.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/DrakX.xml b/docs/docs/stable/installer/sl/DrakX.xml
index b7cdf0c4..68f72708 100644
--- a/docs/docs/stable/installer/sl/DrakX.xml
+++ b/docs/docs/stable/installer/sl/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="sl" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="sl" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Namestitev s programom DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Namestitev s programom DrakX</title>
 
     <cover>
       <para><note>
@@ -33,18 +71,6 @@ dokumentiranje</link>, če jih želite izboljšati.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -59,23 +85,28 @@ dokumentiranje</link>, če jih želite izboljšati.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -85,7 +116,10 @@ dokumentiranje</link>, če jih želite izboljšati.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -93,19 +127,25 @@ dokumentiranje</link>, če jih želite izboljšati.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -113,11 +153,15 @@ dokumentiranje</link>, če jih želite izboljšati.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -136,4 +180,4 @@ dokumentiranje</link>, če jih želite izboljšati.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/sl/SelectAndUseISOs2.xml b/docs/docs/stable/installer/sl/SelectAndUseISOs2.xml
index 6b2418b2..807b2793 100644
--- a/docs/docs/stable/installer/sl/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/sl/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="sl" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Izbor in uporaba odtisa diska: ISO</title>
   </info>
   <section>
     <title>Predstavitev</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
-    <para>Obstajata dve družini namestitvenih medijev:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: Booting with this media provides you with the maximum
-flexibility when choosing what to install, and for configuring your
-system. In particular, you have a choice of which Desktop environment to
-install</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: This option allows you to try out Mageia without having to
-actually install it, or make any changes to your computer.  If the
-installation is decided, the process is simpler, but you get fewer choices
-than offered by the Classical installer</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Podrobnosti so podane v naslednjih poglavjih.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Vir</title>
     <section>
       <title>Definicija</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support (DVD, USB
-stick, ...) the ISO file is copied to.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>Slike odtisov diska lahko najdete <link
 ns4:href="http://www.mageia.org/en/downloads/">tukaj</link>.</para>
     </section>
@@ -43,24 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">tukaj</link>.</para>
         <title>Skupne značilnosti</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the Classical installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
             <para>They are used for performing clean installs or to upgrade a previously
-installed version of Mageia.</para>
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Some tools are available in the Welcome screen: Rescue System, Memory Test,
-Hardware Detection Tool.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Each DVD contains many available desktop environments and languages.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>You'll be given the choice during the installation to add non free software.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -72,21 +107,19 @@ Hardware Detection Tool.</para>
         <itemizedlist>
           <listitem>
             <para>Can be used to preview the Mageia operating system without having to install
-it. Can also be used to install Mageia if you wish.</para>
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade previously installed Mageia
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Vsebuje lastniško programsko opremo.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -94,13 +127,13 @@ releases.</emphasis></para>
         <title>Živi Plasma DVD</title>
         <itemizedlist>
           <listitem>
-            <para>Samo namizno okolje Plasma.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Samo 64-bitna arhitektura.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -108,13 +141,13 @@ releases.</emphasis></para>
         <title>Živi GNOME DVD</title>
         <itemizedlist>
           <listitem>
-            <para>Samo namizno okolje GNOME.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Samo 64-bitna arhitektura</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -122,13 +155,13 @@ releases.</emphasis></para>
         <title>Živi Xfce DVD</title>
         <itemizedlist>
           <listitem>
-            <para>Samo namizno okolje Xfce.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 in 64-bitni arhitekturi.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -139,22 +172,10 @@ releases.</emphasis></para>
         <title>Skupne značilnosti</title>
         <itemizedlist>
           <listitem>
-            <para>These are minimal ISO's containing no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient if
-bandwidth is too low to download a full DVD, or if you have a PC without a
-DVD drive or is unable to boot from a USB stick.</para>
-          </listitem>
-          <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>First steps are English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -162,8 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -171,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains non-free software (mostly drivers, codecs...) for people who need
-it.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -184,16 +204,23 @@ it.</para>
       <title>Prejemanje</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, you are provided with some information, such as
-the mirror in use and an option to switch if the bandwidth is too low. If
-http is chosen, you will also see something regarding checksums.</para>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the
-other, and copy the checksum <link linkend="integrity">for later
-use</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
@@ -201,52 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
 algorithm from the file to be downloaded. You may compare the checksum of
 your downloaded ISO against that of the original source ISO. If the
 checksums do not match, it means that the actual data on the ISO's do not
-match, and if it is the case, then you should retry the download or attempt
-a repair using BitTorrent.</para>
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>To generate the checksum for your downloaded ISO, open a console, (no need
 to be root), and:</para>
       <itemizedlist>
         <listitem>
-          <para>To use md5sum, type: <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>To use sha1sum, type: <userinput>sha1sum
-path/to/the/image/file.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Primer:</para>
+      <para>Primer:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Zapecite ali prenesite odtis diska</title>
-    <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
-stick. This is not a standard copy operation as a bootable medium will
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
 actually be created.</para>
     <section>
       <title>Burning the ISO to a CD/DVD</title>
-      <para>Whichever software you use, ensure that the option to burn an<emphasis
-role="bold"> image</emphasis> is used, burn <emphasis
-role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not
-correct. Seen the <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link> for more information.</para>
     </section>
     <section>
       <title>Odlaganje odtisa nosilca za namestitev na ključek USB</title>
-      <para>All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick
-and then use it to boot and install the system.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any existing data will be lost and the partition capacity will
-be reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>To recover the original capacity, you must redo partitioning and re-format
-the USB stick.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Using a graphical tool within Mageia</title>
         <para>Uporabite lahko orodje z grafičnim vmesnikom kot je <link
@@ -258,7 +296,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <itemizedlist>
           <listitem>
             <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -267,7 +305,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Using Command line within a GNU/Linux system</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk overwriting
 potentially valuable existing data if you specify the wrong target device.</para>
@@ -277,27 +315,28 @@ potentially valuable existing data if you specify the wrong target device.</para
             <para>Odprite konzolo</para>
           </listitem>
           <listitem>
-            <para>Become a root (Administrator) user with the command <userinput>su
--</userinput> (don't forget the final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Plug in your USB stick (do not mount it, this also means do not open any
-application or file manager that could access or read it)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Enter the command <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
             <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
             <para>Alternatively, you can find the device name with the command
-<code>dmesg</code>: towards the end of this example, you can see the device
-name starting with <emphasis>sd</emphasis>, and in this case, <emphasis>
-sdd</emphasis> is the actual device. You can also see that its size is 2GB:</para>
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
@@ -318,21 +357,22 @@ sdd</emphasis> is the actual device. You can also see that its size is 2GB:</par
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: <emphasis role="bold"># <userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Where X=your device name eg: /dev/sdd</para>
-            <para>Example:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-and <emphasis role="bold">of</emphasis> stands for <emphasis
-role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Vnesite ukaz: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>This is the end of the process, and you may now unplug your USB stick.</para>
@@ -341,4 +381,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/acceptLicense.xml b/docs/docs/stable/installer/sl/acceptLicense.xml
index c7dc5f46..9e509a7d 100644
--- a/docs/docs/stable/installer/sl/acceptLicense.xml
+++ b/docs/docs/stable/installer/sl/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Licenčna pogodba in opombe ob izdaji</title>
   </info>
 
@@ -46,19 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">Licenčna pogodba</title>
     </info>
 
-    <para>Pred namestitvijo <application>Mageje</application> pozorno preberite
-licenčne pogoje.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Ti licenčni pogoji se nanašajo na celotno distribucijo
-<application>Mageia</application>. Pred nadaljevanjem jih je potrebno
-sprejeti.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Za nadaljevanje preprosto označite  <guilabel>Sprejmem</guilabel> in
-kliknite gumb <guibutton>Naprej</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Zahvaljujemo se za vaš ogled tudi če se odločite, da teh pogojev ne boste
-sprejeli. S klikom na gumb <guibutton>Izhod</guibutton> se bo vaš računalnik
-ponovno zagnal.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -76,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Za to izdajo distribucije <application>Mageia</application> so na voljo
-pomembne informacije, dosegljive s klikom na gumb <guibutton>Opombe ob
-izdaji</guibutton>.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/addUser.xml b/docs/docs/stable/installer/sl/addUser.xml
index 7185330b..2bfe4bd1 100644
--- a/docs/docs/stable/installer/sl/addUser.xml
+++ b/docs/docs/stable/installer/sl/addUser.xml
@@ -1,32 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Upravljanje z naprednimi in navadnimi uporabniki</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Nastavite geslo skrbnika (uporabnika root):</title>
     </info>
 
-    <para>V vseh namestitvah <application>Mageje</application> je priporočljivo
-nastaviti geslo <emphasis role="bold">skrbnika</emphasis>(administratorja) ,
-v Linux-u znan kot <emphasis>geslo root uporabnika</emphasis>. Med tipkanjem
-gesla v polje se bo barva ščita spremenila glede na moč gesla od rdeče do
-rumene in pri močnem geslu zelene. Zaradi preverjanja pravilnosti vnosa
-morate geslo ponoviti v polju niže.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>Vsa gesla so občutljiva na velikost črk. Najbolje je v njem uporabiti
-mešanico velikih ter malih črk, številk in posebnih znakov.</para>
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
 
@@ -35,43 +55,46 @@ mešanico velikih ter malih črk, številk in posebnih znakov.</para>
       <title xml:id="enterUser-ti3">Dodajte uporabnika</title>
     </info>
 
-    <para>Tukaj dodajte uporabnika. Ta navadni uporabnik bo imel manj pravic kot
-<emphasis role="bold">skrbnik</emphasis> (root), a dovolj za uporabo spleta,
-pisarniških programov, igranje iger in vse ostalo kar običajni uporabnik
-počne z računalnikom.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Ikona</guibutton>: s klikom na ta gumb je možno spremeniti ikono
-oz. sliko uporabnika.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Pravo ime</guilabel>: tukaj vnesite pravo ime uporabnika.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Prijavno ime</guilabel>: Tukaj vnesete prijavno ime uporabnika ali
-pustite programu DrakX uporabiti verzijo pravega imena uporabnika. <emphasis
-role="bold">Prijavno ime razlikuje med velikostjo črk.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Geslo</guilabel>: V ta tekstovni okvir vnesite uporabniško
-geslo. Med tipkanjem gesla v polje se bo barva ščita desno spremenila glede
-na moč gesla od rdeče do rumene in pri močnem geslu zelene. (Glejte tudi
-<xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Geslo (ponovno)</guilabel>: Program Drakx preverja pravilnost
-vnosa, zato morate vnos gesla ponoviti.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Vsak uporabnik, dodan med namestitvijo Mageje, bo imel domačo mapo zaščiteno
-tako pred branjem kot tudi pisanjem (umask=0027) drugih uporabnikov.</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>Več uporabnikov je med namestitvijo možno dodati v koraku
 <emphasis>Nastavitve - povzetek</emphasis>. Izberite <emphasis>Upravljanje
@@ -81,32 +104,31 @@ uporabnikov</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Napredno upravljanje z uporabniki</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>S klikom na gumb <guibutton>Napredno</guibutton> lahko urejate nastavitev za
-tega dodanega uporabnika.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
-<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis>
-and <emphasis role="bold">Sh</emphasis></para>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the <emphasis
-role="bold">user ID</emphasis> for any user you added in the previous
-screen. If you are unsure what the purpose of this is, then leave it blank.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sl/add_supplemental_media.xml b/docs/docs/stable/installer/sl/add_supplemental_media.xml
index 0aa9852d..d4018f6f 100644
--- a/docs/docs/stable/installer/sl/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/sl/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="sl">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Izbira virov (nastavitev dodatnih virov namestitve)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,41 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>Ta zaslon ponuja seznam že prepoznanih odlagališč paketov. Lahko dodate še
-kak drug vir, recimo DVD ali kak oddaljen vir. Ta izbor bo določil kateri
-paketi bodo na voljo v naslednjih korakih.</para>
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Za omrežni vir je potrebno slediti dvema korakoma:</para>
 
   <orderedlist>
     <listitem>
-      <para>Izbor in po potrebi aktiviranje omrežja.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
-      <para>Izbor zrcala ali določanje URL-ja (čisto prvi vnos). Z izborom zrcala
-pridobite dostop do vseh skladišč, ki jih upravlja skupnost Mageia, Npr. z
-lastniško programsko opremo: <emphasis role="bold">Nonfree</emphasis> ali
-Patentno zaščiteni: <emphasis role="bold">Tainted</emphasis> in seveda
-<emphasis role="bold">posodobitve</emphasis>. Z določanjem URL-ja lahko
-določite specifično skladišče ali vašo lastno namestitev NFS.</para>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>Za posodobitev 64-bitne namestitve, ki lahko vsebuje nekaj 32-bitnih paketov
-je priporočljivo tukaj dodati aktivno zrcalo z označenjem enega od omrežnih
-protokolov. To je potrebno, ker 64-bitna slika odtisa diska ne vsebuje
-32-bitnih paketov, zato jih brez aktivnega zrcala namestitev ne more
-posodobiti.</para>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/ask_mntpoint_s.xml b/docs/docs/stable/installer/sl/ask_mntpoint_s.xml
index e54dbbc6..30886b23 100644
--- a/docs/docs/stable/installer/sl/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/sl/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="sl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Izberite priklopne točke</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
 
   <para>Here you see the Linux partitions that have been found on your computer. If
-you don't agree with the <application>DrakX</application> suggestions, you
-can change the mount points.</para>
-
-  <note>
-    <para>Karkoli spremenite, pazite, da korenski razdelek <literal>/</literal>
-(koren) ostane.</para>
-  </note>
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis
-role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
-name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis>
-(for example, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>If you have several partitions, you can choose various different mount
-points from the drop down menu, such as <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis
-role="bold">/var</emphasis>. You can even make your own mount points, for
-instance <emphasis role="bold"><literal>/video</literal></emphasis> for a
-partition where you want to store your films, or <emphasis
-role="bold">/Data</emphasis> (or some other name) for your data.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -79,13 +82,17 @@ mount point field blank.</para>
   </itemizedlist>
 
   <warning>
-    <para>If you are not sure what to choose, click <emphasis
-role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
-disk partitioning</guilabel>, where, you can click on a partition to see its
-type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
   <para>If you are sure the mount points are correct, click on
-<guibutton>Next</guibutton>, and choose whether you only want to format the
-partition(s) DrakX suggests, or more.</para>
-</section>
\ No newline at end of file
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/sl/bestTime.xml b/docs/docs/stable/installer/sl/bestTime.xml
index ba130065..0e14f3ce 100644
--- a/docs/docs/stable/installer/sl/bestTime.xml
+++ b/docs/docs/stable/installer/sl/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sl" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="sl" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Nastavitve ure</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>In this step, you have to select on which time your internal clock is set,
-either local time or UTC time.</para>
-
-  <para>In advanced tab, you will find more options about clock settings.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/bootLive.xml b/docs/docs/stable/installer/sl/bootLive.xml
index 2b4d3fd3..d6ea8d8c 100644
--- a/docs/docs/stable/installer/sl/bootLive.xml
+++ b/docs/docs/stable/installer/sl/bootLive.xml
@@ -1,30 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="sl"><info><title xml:id="bootLive-ti1">Zaženi Magejo kot živ sistem</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Zagon medija</title></info><section><info><title xml:id="bootLive11-ti1">Z diska</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
-DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
-bootloader to launch the installation automatically after rebooting the
-computer. If that does not happen you may need to reconfigure your BIOS or
-press one key that will offer you to choose the peripheral from which the
-computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">Z naprave USB</title></info><para>You can boot from the USB device on which you dumped your image
-ISO. According to your BIOS settings, the computer boots perhaps directly on
-the USB device already plugged in a port. If that does not happen you may
-need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">V načinu BIOS/CSM/Legacy</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Prvi zaslon med zagonom v načinu BIOS</para></caption></mediaobject><para>V srednjem meniju so na voljo tri možna dejanja:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
-or USB stick) without writing anything on the disk, so expect a very slow
-system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
-when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para></listitem></itemizedlist><para>V spodnjem meniju so na voljo zagonske možnosti:</para><itemizedlist><listitem><para>F1 - pomoč. Razlaga možnosti »splash«, »apm«, »acpi« in »Ide«</para></listitem><listitem><para>F2 - jezik. Izbor jezika za prikaz na zaslonu.</para></listitem><listitem><para>F3 - ločljivost zaslona. Na voljo je izbor: tekst, 640x400, 800x600,
-1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
-the inserted installation medium. Here, select other sources, like FTP or
-NFS servers. If the installation is carried out in a network with an SLP
-server, select one of the installation sources available on the server with
-this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
-optional disk with a driver update and will require its insertion during
-installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">V načinu UEFI</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Prvi zaslon med zagonom sistema z diska v načinu UEFI </para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice)  or to
-process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
-duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para><para>In each case, the first steps will be the same to choose language, timezone
-and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Zaženi Magejo kot živ sistem</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Zagon medija</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">V načinu BIOS/CSM/Legacy</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Prvi zaslon med zagonom v načinu BIOS</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">V načinu UEFI</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/sl/chooseDesktop.xml b/docs/docs/stable/installer/sl/chooseDesktop.xml
index 03dcaa5e..b80d0de8 100644
--- a/docs/docs/stable/installer/sl/chooseDesktop.xml
+++ b/docs/docs/stable/installer/sl/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Izbira namizja</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Izbira namizja</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide-show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application>
-<emphasis role="bold">Plasma </emphasis>or <application>GNOME</application>
-desktop environment. Both come with a full set of useful applications and
-tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
-use both), or if you want to modify the default software choices for these
-desktop environments. The <application>LXDE</application> desktop, for
-instance, is lighter than the previous two, sporting less eye candy and
-fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/sl/choosePackageGroups.xml b/docs/docs/stable/installer/sl/choosePackageGroups.xml
index 1e610f1f..e8ba1a95 100644
--- a/docs/docs/stable/installer/sl/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/sl/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Izbira skupin paketov</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/sl/choosePackagesTree.xml b/docs/docs/stable/installer/sl/choosePackagesTree.xml
index e16f502c..9e123e11 100644
--- a/docs/docs/stable/installer/sl/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/sl/choosePackagesTree.xml
@@ -1,21 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="sl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="sl">
   <info>
     <title xml:id="choosePackagesTree-ti1">Izbira posamičnih paketov</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-  <para>After having made your choice, you can click on the <guibutton>floppy
-icon</guibutton> at the bottom of the page to save your choice of packages
-(saving to a USB key works, too). You can then use this file to install the
-same packages on another system, by pressing the same button during install
-and choosing to load it.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/configureServices.xml b/docs/docs/stable/installer/sl/configureServices.xml
index 5d2df0b3..9a6e78cb 100644
--- a/docs/docs/stable/installer/sl/configureServices.xml
+++ b/docs/docs/stable/installer/sl/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="sl" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Nastavite vaše storitve</title>
   </info>
@@ -7,21 +7,32 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Tukaj lahko izberete ter nastavite storitve, ki naj se samodejno zaženejo ob
 zagonu računalnika.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">Izbor, ki ga naredi DrakX, je običajno primeren.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">If you highlight a service, some information about it is shown in the info
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">If you highlight a service, some information about it is shown in the info
 box below.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Only change things when you know very well what you are doing.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/configureTimezoneUTC.xml b/docs/docs/stable/installer/sl/configureTimezoneUTC.xml
index 663de3f7..980aaca3 100644
--- a/docs/docs/stable/installer/sl/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/sl/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="sl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="sl">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Nastavite vaš časovni pas</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the
-same time-zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
 or to GMT, also known as UTC.</para>
diff --git a/docs/docs/stable/installer/sl/configureX_card_list.xml b/docs/docs/stable/installer/sl/configureX_card_list.xml
index dfafc8cd..0004b351 100644
--- a/docs/docs/stable/installer/sl/configureX_card_list.xml
+++ b/docs/docs/stable/installer/sl/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="sl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Izberite strežnik X ()nastavite grafično kartico</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX has a very comprehensive database of video cards and will usually
 correctly identify your video device.</para>
@@ -29,33 +42,34 @@ correctly identify your video device.</para>
   <para>If the installer has not correctly detected your graphic card and you know
 which one you have, you can select it from the tree by: <itemizedlist>
       <listitem>
-        <para>Proizvajalec</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>ime vaše kartice</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>in tip kartice</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-<emphasis role="bold">Xorg</emphasis> category, which provides more than 40
-generic and open source video card drivers. If you still can't find a
-specific driver for your card there is the option of using the <emphasis
-role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the <emphasis role="bold">Command-line</emphasis> Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the <emphasis role="bold">Nonfree</emphasis>
-repository and in some cases only from the card manufacturers' websites.</para>
-
-  <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be
-explicitly enabled to access them. If you didn't enable it previously, you
-should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/sl/configureX_chooser.xml b/docs/docs/stable/installer/sl/configureX_chooser.xml
index d0313b99..d2e9f098 100644
--- a/docs/docs/stable/installer/sl/configureX_chooser.xml
+++ b/docs/docs/stable/installer/sl/configureX_chooser.xml
@@ -1,62 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="sl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Nastavitev grafične kartice in monitorja</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym> or any other graphical environment to work well, the
-following <acronym>X</acronym> settings need to be correct. Choose the
-correct settings if none are shown, or if you think the details are
-incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Grafična kartica</guibutton></emphasis>: Izberite jo iz
-seznama, če je potrebno.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from
-the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose
-<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and
-vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Napačna frekvenca osveževanja lahko poškoduje vaš monitor</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Ločljivost</guibutton></emphasis>: tukaj lahko
-nastavite ločljivost in barvno globino.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the option is there, and you test your
-settings, you should be ask whether your settings are correct. If you answer
-<emphasis role="bold">yes</emphasis>, the settings will be kept. If you
-don't see anything, you'll return to the configuration screen and be able to
-reconfigure everything until the test result is satisfactory. If the test
-option is not available, then make sure your settings are on the safe side.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to
-enable or disable various options.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/sl/configureX_monitor.xml b/docs/docs/stable/installer/sl/configureX_monitor.xml
index 45e2cac0..1f2a2974 100644
--- a/docs/docs/stable/installer/sl/configureX_monitor.xml
+++ b/docs/docs/stable/installer/sl/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="sl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,64 +23,82 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Izberite vaš zaslon</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX has a very comprehensive database of monitors and will usually
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX has a very comprehensive database of monitors and will usually
 correctly identify yours.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
 could damage your monitor or video hardware. Please don't try something
 without knowing what you are doing.</emphasis> If in doubt you should
 consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Po meri</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters, the vertical refresh
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
 rate and the horizontal sync rate. Vertical refresh determines how often the
 screen is refreshed and horizontal sync is the rate at which scan lines are
 displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
+        <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
 type with a sync range that is beyond the capabilities of your monitor: you
 may damage your monitor. If in doubt, choose a conservative setting and
 consult your monitor documentation.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Vstavi in poženi</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">This is the default option and tries to determine the monitor type from the
-monitor database.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>prodajalec</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">If the installer has not correctly detected your monitor and you know which
-one you have, you can select it from the tree by selecting: <itemizedlist>
       <listitem>
-        <para>Proizvajalec</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>ime proizvajalca zaslona</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>opis zaslona</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can select it from the tree by selecting:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Običajen</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the <emphasis
-role="bold">Vesa</emphasis> card driver when your video hardware cannot be
-determined automatically. Once again it may be wise to be conservative in
-your selections.</para>
-</section>
\ No newline at end of file
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/sl/diskPartitioning.xml b/docs/docs/stable/installer/sl/diskPartitioning.xml
new file mode 100644
index 00000000..faa9d34f
--- /dev/null
+++ b/docs/docs/stable/installer/sl/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="sl" version="5.0" xml:lang="sl">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/diskdrake.xml b/docs/docs/stable/installer/sl/diskdrake.xml
index ef36381a..96805955 100644
--- a/docs/docs/stable/installer/sl/diskdrake.xml
+++ b/docs/docs/stable/installer/sl/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Razdeljevanje diska po meri s programom DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis>
-partition you must ensure that you have a separate <emphasis
-role="bold">/boot</emphasis> partition. The encryption option for the
-<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise
-your system will be unbootable.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view their details before you start.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage
-device like a USB key). In the screen-shot above there are two available
-devices: <emphasis role="bold">sda </emphasis>and <emphasis
-role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if
-you are sure you want to wipe all partitions on the selected storage device.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Expert mode</guibutton> provides more options such as a label
-(give a name to) a partition, or to choose a partition type.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Klikni <guibutton>Končano</guibutton> ko bo v redu.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
-Partition) is present and correctly mounted on /boot/EFI (see below)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/sl/doPartitionDisks.xml b/docs/docs/stable/installer/sl/doPartitionDisks.xml
index 023606e2..0d1029e2 100644
--- a/docs/docs/stable/installer/sl/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/sl/doPartitionDisks.xml
@@ -1,172 +1,213 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Razdelitev diska</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the
-DrakX partitioning proposals for where to install
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the
-layout and content of your particular hard drive(s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Uporabi obstoječe razdelke</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">If this option is available, then existing Linux compatible partitions have
+      <para revision="1" xml:id="doPartitionDisks-pa5">If this option is available, then existing Linux compatible partitions have
 been found and may be used for the installation.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Uporabi razpoložljivi prostor</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">If you have unused space on your hard drive then this option will use it for
+      <para revision="1" xml:id="doPartitionDisks-pa7">If you have unused space on your hard drive then this option will use it for
 your new Mageia installation.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Uporabi razpoložljivi prostor v razdelku za Windows</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">If you have unused space on an existing Windows partition, the installer may
-offer to use it.</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">This can be a useful way of making room for your new Mageia installation,
-but is a risky operation so you should make sure you have backed up all
-important files!</para>
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
 
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
 partition must be "clean", meaning that Windows must have closed down
 correctly the last time it was used. It must also have been defragmented,
 although this is not a guarantee that all files in the partition have been
 moved out of the area that is about to be used. It is highly recommended to
 back up your personal files.</para>
+      </important>
+    </listitem>
 
-        <para>With this option, the installer displays the remaining Windows partition in
-light blue and the proposed Mageia partition in dark blue with their
-intended sizes just underneath. You have the option to modify these sizes by
-clicking and dragging the gap between both partitions. See the following
-screen-shot.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Zbriši in uporabi celoten disk.</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">Ta možnost bo namenila celoten pogon za Magejo.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Pozor! To bo pobrisalo VSE podatke na izbrani napravi. Pazljivo!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">S tem imate popoln nadzor nad namestitvijo na (enem ali več) vaših diskov.</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">If you intend to use part of the disk for something else, or you already
-have data on the drive that you are not prepared to lose, then do not use
-this option.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Razdeljevanje diska po meri</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>Če je vsega razpoložljivega prostora na voljo več kot 50 GB, bodo ustvarjeni
+trije razdelki</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">S tem imate popoln nadzor nad namestitvijo na (enem ali več) vaših diskov.</para>
-      </listitem>
-    </itemizedlist></para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Spreminjanje velikosti razdelkov:</emphasis></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para>If you are not using the <emphasis role="bold">Custom disk
-partitioning</emphasis> option, the installer will allocate the available
-space according to the following rules:</para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>Če je vsega razpoložljivega prostora na voljo manj kot 50 GB, bo ustvarjen
-samo en razdelek in sicer korenski: <emphasis role="bold">/</emphasis>(root)
-. Brez ločenega domačega razdelka: /home.</para>
-      </listitem>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-      <listitem>
-        <para>Če je vsega razpoložljivega prostora na voljo več kot 50 GB, bodo ustvarjeni
-trije razdelki</para>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 prostora na voljo bo namenjeno korenskemu: <emphasis
-role="bold">/</emphasis>, a ne več kot 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 bo rezervirana izmenjalnemu razdelku: swap, a največ 4 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>ostalih (vsaj 12/19) bo uporabljenih za domači razdelek: <emphasis
-role="bold">/home</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-  <para>To pomeni, da bo namestitev pri 160 GB ali več razpoložljivega prostora
-ustvarila tri razdelke: 50 GB za korenskega: <emphasis
-role="bold">/</emphasis>, 4 GB za <emphasis
-role="bold">izmenjalnega</emphasis> in preostalo za domačo mapo: <emphasis
-role="bold">/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
-automatically detected - or created if it does not exist yet, and mounted on
-/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to
-create a BIOS boot partition if not already existing. It is a roughly 1 MiB
-partition with no mount point. Choose <xref linkend="diskdrake"/> to be able
-to create it with the Installer like any other partition, just select BIOS
-boot partition as the filesystem type.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512. Due to lack of available hardware, the
 partitioning tool used in the installer has not been tested with such a
-drive. Also some SSD devices now use an erase block size over 1 MB. If you
-have such a device we suggest that you partition the drive in advance, using
-an alternative partitioning tool like <emphasis
-role="bold">gparted</emphasis>, and to use the following settings:</para>
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Poravnaj z</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/sl/exitInstall.xml b/docs/docs/stable/installer/sl/exitInstall.xml
index fb78df66..a54eb47c 100644
--- a/docs/docs/stable/installer/sl/exitInstall.xml
+++ b/docs/docs/stable/installer/sl/exitInstall.xml
@@ -5,23 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring
-<application>Mageia</application> and it is now safe to remove the
-installation medium and reboot your computer.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems (if there are more than one) on your computer.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the settings for the bootloader, your Mageia install
 will be automatically selected and started.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Uživajte</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Visit www.mageia.org if you have any questions or want to contribute to
-Mageia</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/firewall.xml b/docs/docs/stable/installer/sl/firewall.xml
index 4e4344b1..4353235b 100644
--- a/docs/docs/stable/installer/sl/firewall.xml
+++ b/docs/docs/stable/installer/sl/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="sl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="sl" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Požarni zid</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Požarni zid</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
   <para>In the default setting (no button is checked), no service of the system is
-accessible from the network. The <emphasis role="bold">Everything (no
-firewall)</emphasis> enables access to all services of the machine - an
-option that does not make much sense in the context of the installer since
-it would create a totally unprotected system. Its veritable use is in the
-context of the Mageia Control Center (which uses the same GUI layout) for
-temporarily disabling the entire set of firewall rules for testing and
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
 debugging purposes.</para>
 
   <para>All other options are more or less self-explanatory. As an example, you will
-enable the <emphasis role="bold">CUPS server</emphasis> if you want printers
-on your machine to be accessible from the network.</para>
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Napredno</emphasis></para>
 
-  <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where
-you can enable a series of services by typing a list of couples (blank
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
   <para><emphasis>&lt;številka-vrat>/&lt;protokol></emphasis></para>
diff --git a/docs/docs/stable/installer/sl/formatPartitions.xml b/docs/docs/stable/installer/sl/formatPartitions.xml
index 4a602140..ee49f372 100644
--- a/docs/docs/stable/installer/sl/formatPartitions.xml
+++ b/docs/docs/stable/installer/sl/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="sl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formatiranje</title>
   </info>
@@ -11,32 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
 partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Usually at least the partitions DrakX selected, need to be formatted</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Click on <guibutton>Advanced</guibutton> to choose partitions you want to
-check for so called <emphasis>bad blocks</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen,
-where you can choose to view details of your partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">Ko boste z izborom zadovoljni, kliknite <guibutton>Naprej</guibutton> za
-nadaljevanje.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/sl/graphicalConfiguration.xml b/docs/docs/stable/installer/sl/graphicalConfiguration.xml
new file mode 100644
index 00000000..47465f5c
--- /dev/null
+++ b/docs/docs/stable/installer/sl/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/sl/installUpdates.xml b/docs/docs/stable/installer/sl/installUpdates.xml
index 78cae4a3..6c43973c 100644
--- a/docs/docs/stable/installer/sl/installUpdates.xml
+++ b/docs/docs/stable/installer/sl/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="sl">
-  <info>
-    <title xml:id="installUpdates-ti1">Posodobitve</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Posodobitve</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of <application>Mageia</application> was released, some
-packages will have been updated or improved.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them,
-select <guilabel>No</guilabel> if you don't want to do this now, or if you
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
 aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Kliknite <guibutton>Naprej</guibutton> za nadaljevanje</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/installer.xml b/docs/docs/stable/installer/sl/installer.xml
index add01812..8c5cf8a4 100644
--- a/docs/docs/stable/installer/sl/installer.xml
+++ b/docs/docs/stable/installer/sl/installer.xml
@@ -6,165 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, namestitveni program Mageje</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, namestitveni program Mageje</title>
   </info>
 
   <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
 Installer is designed to help make your installation or upgrade as easy as
 possible.</para>
 
-  <para>The initial menu screen has various options, however the default one will
-start the installer, which will normally be all that you will need.</para>
+  <section>
+    <title>Namestitveni koraki</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Prikaz dobrodošlice namestitve</title>
 
-    <section>
-      <title>Uporaba Magejinega DVD-ja</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>From this screen, you have access to options by pressing "<emphasis
-role="bold">e</emphasis>" to enter the edit mode. To come back to this
-screen, press either <emphasis role="bold">Esc</emphasis> key to quit
-without saving or press the key <emphasis role="bold">Ctrl</emphasis> or
-<emphasis role="bold">F10</emphasis> to quit with saving.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, it is possible to set some preferences (note that the
-options <emphasis role="bold">F1</emphasis> to <emphasis
-role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist>
-          <listitem>
-            <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis
-role="bold">F6</emphasis> options, you can view relevant help by pressing
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a
-specific language for the installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>If needed, change the screen resolution by pressing <emphasis
-role="bold">F3</emphasis> (Legacy mode only).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis role="bold">F6</emphasis> <emphasis
-role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis
-role="bold">e</emphasis> instead).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Privzeto: ne spremeni ničesar v privzetih možnostih.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: Priority is given to the safer options at the price of a
-performance detriment.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI: (Advanced Configuration and Power Interface): Power management
-features are not used.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU
-interrupt. Select this option if you experience system misbehaviour like a
-kernel panic in relation to APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>When you select one of these entries, it modifies the default options
-displayed in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with
-<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot
-Options</guilabel> line, despite this, they will in fact be applied.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various
-boot options. Select an item with the arrow keys and press <emphasis
-role="bold">Enter</emphasis> for more details or press <emphasis
-role="bold">Esc</emphasis> to go back to the welcome screen.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>The detailed view about the splash option. Press <emphasis
-role="bold">Esc</emphasis> or select <guilabel>Return to Boot
-Options</guilabel> to go back to the options list. These options can be
-added by hand in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>For more information about kernel options on legacy and UEFI systems, see:
-<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>Namestitveni koraki</title>
+    <section>
+      <title>UEFI Systems</title>
 
-    <para>The install process is divided into a number of steps, the status of which
-is indicated in a panel to the left of the screen.</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
-options.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
-about the particular step.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
-is possible to reboot, but please think twice before you do this. Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -175,19 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>After the initial screen you did not reach the language selection
-screen. This can happen with some graphic cards and older systems. Try using
-low resolution by typing <code>vgalo</code> at the prompt.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this press <emphasis role="bold">Esc</emphasis> at the first welcome screen
-and confirm with <emphasis role="bold">ENTER</emphasis>. You will be
-presented with a black screen with the word "boot:". Type "text" and press
-<emphasis role="bold">ENTER</emphasis> to continue with the installation in
-text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -196,10 +196,10 @@ text mode.</para>
       <title>Namestitev zamrzne</title>
 
       <para>If the system appeared to freeze during the installation, this may be a
-problem with hardware detection. In this case the automatic detection of
-hardware may be bypassed and dealt with later. To try this, type
-<code>noauto</code> at the prompt. This option may also be combined with
-other options as necessary.</para>
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -207,17 +207,18 @@ other options as necessary.</para>
 
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dinamični razdelki</title>
 
-      <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis>
-format to <emphasis role="bold">dynamic</emphasis> format in Microsoft
-Windows, then it is not possible to install Mageia on this disc. To revert
-to a basic disk, see the Microsoft documentation: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/sl/locale.xml b/docs/docs/stable/installer/sl/locale.xml
new file mode 100644
index 00000000..46ff1947
--- /dev/null
+++ b/docs/docs/stable/installer/sl/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/sl/login.xml b/docs/docs/stable/installer/sl/login.xml
index c1b1de79..e68b0449 100644
--- a/docs/docs/stable/installer/sl/login.xml
+++ b/docs/docs/stable/installer/sl/login.xml
@@ -1,5 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="sl"><info><title xml:id="label-to-adapt-ti1">Prijavni zaslon</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM-jev prijavni zaslon</para></caption></mediaobject><para>Naposled boste prispeli do prijavnega zaslona.</para><para>Enter your user name and user password, and in a few seconds you will find
-yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para><para>Najdete jih <link
-ns4:href="http://www.mageia.org/sl/downloads/">tukaj</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="sl">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/media_selection.xml b/docs/docs/stable/installer/sl/media_selection.xml
index 62e32cf1..0a612415 100644
--- a/docs/docs/stable/installer/sl/media_selection.xml
+++ b/docs/docs/stable/installer/sl/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="sl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Izbira virov z lastniško programsko opremo (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Here you have the list of available repositories. Not all repositories are
 available, according to which media you use for installing. The repositories
@@ -35,7 +44,7 @@ the base of the distribution.</para>
       <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
 free-of-charge, i.e. Mageia may redistribute them, but they contain
 closed-source software (hence the name - Nonfree). For example this
-repository includes nVidia and ATI graphics card proprietary drivers,
+repository includes nVidia and AMD graphics card proprietary drivers,
 firmware for various WiFi cards, etc.</para>
     </listitem>
 
diff --git a/docs/docs/stable/installer/sl/minimal-install.xml b/docs/docs/stable/installer/sl/minimal-install.xml
index 3088aa49..ea2f25cf 100644
--- a/docs/docs/stable/installer/sl/minimal-install.xml
+++ b/docs/docs/stable/installer/sl/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="sl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="sl">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Minimalna namestitev</title>
   </info>
@@ -10,26 +13,40 @@
 
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
-  <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+  
 
-  <para>Minimal Installation is intended for those with specific uses in mind for
-<application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the <emphasis
-role="bold">Individual package selection</emphasis> option mentioned above,
-to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>If you choose this installation method, then the relevant screen will offer
-you a few useful extras to install, such as documentation and X.</para>
+  
 
-  <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
 lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para>The basic documentation is provided in the form of man and info pages.  It
-contains the man pages from the <link
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
 Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
diff --git a/docs/docs/stable/installer/sl/misc-params.xml b/docs/docs/stable/installer/sl/misc-params.xml
index 80c15582..14d2bec1 100644
--- a/docs/docs/stable/installer/sl/misc-params.xml
+++ b/docs/docs/stable/installer/sl/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Povzetek raznih nastavitev</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
 
   <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
 the choices you made and on the hardware detected. You can check the
 settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>Splošno pravilo je, da je najbolje sprejeti privzete vrednosti, razen v
@@ -26,7 +42,7 @@ primerih:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>kak drug spodaj podrobneje razložen faktor povzroča težave.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,46 +54,47 @@ primerih:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Časovni pas</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
 can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Država</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
 setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Zagonski nalagalnik</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX has made good choices for the bootloader setting.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Za več informacij poglejte <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Upravljanje z uporabniki</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each get their own
-<literal>/home</literal> directories.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Storitve</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
 (daemons).  This tool allows you to enable or disable certain processes.</para>
 
         <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
-prevent your computer from operating correctly.</para>
-
-        <para>Za več informacij poglejte <xref linkend="configureServices"/></para>
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -89,7 +106,7 @@ prevent your computer from operating correctly.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Tipkovnica</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
 of keyboard.</para>
@@ -101,27 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Miška</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add or configure other pointing devices, tablets, trackballs
 etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Zvočna kartica</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The
-option to select a different driver is only given when there is more than
-one driver for your card, but where none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Grafični vmesnik</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">V tem delu lahko nastavljate (eno ali več) grafičnih kartic in zaslonov.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Za več informacij poglejte <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -136,11 +158,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Omrežje</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, using the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
@@ -150,14 +172,14 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Posredniški strežniki</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
         <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
-internet.  This section allows you to configure your computer to utilize a
+Internet.  This section allows you to configure your computer to utilize a
 proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -169,26 +191,31 @@ need to enter here.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Stopnja varnosti</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Here you set the Security level for your computer, in most cases the default
-setting (Standard) is adequate for general use.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Check the option which best suits your usage.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Požarni zid</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">A firewall is intended to be a barrier between your important data and the
-rascals out there on the internet who would compromise or steal it.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing everything (no firewall) may be very risky.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/sl/reboot.xml b/docs/docs/stable/installer/sl/reboot.xml
index de4e38b0..e71448bd 100644
--- a/docs/docs/stable/installer/sl/reboot.xml
+++ b/docs/docs/stable/installer/sl/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="sl" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Ponovni zagon</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/sl/securityLevel.xml b/docs/docs/stable/installer/sl/securityLevel.xml
index 1b784211..011cde50 100644
--- a/docs/docs/stable/installer/sl/securityLevel.xml
+++ b/docs/docs/stable/installer/sl/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Stopnja varnosti</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended
-setting for the average user. The <emphasis role="bold">Secure</emphasis>
-setting will create a highly protected system - for instance if the system
-is to be used as a public server.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Security Administrator</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
 which require notification to a system administrator.</para>
 
-  <para>A good, and easy-to-implement, choice is to enter &lt;user>@localhost -
-where &lt;user> is the login name of the user to receive these messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
 be configured for receiving such mail!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/sl/selectCountry.xml b/docs/docs/stable/installer/sl/selectCountry.xml
index 03369da0..846692cc 100644
--- a/docs/docs/stable/installer/sl/selectCountry.xml
+++ b/docs/docs/stable/installer/sl/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="sl">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="sl">
   <info>
     <title xml:id="selectCountry-ti1">Izbor države/regije</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> option and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem that a country from the
-first list was chosen. Please ignore this, as DrakX will apply your actual
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,7 +40,7 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Način vnosa</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
@@ -39,9 +50,9 @@ selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via <emphasis role="bold">Configure
-your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
-running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/selectInstallClass.xml b/docs/docs/stable/installer/sl/selectInstallClass.xml
index 8140075c..f39fb8ab 100644
--- a/docs/docs/stable/installer/sl/selectInstallClass.xml
+++ b/docs/docs/stable/installer/sl/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="sl" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Namestitev ali nadgradnja</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Namesti</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option to perform a fresh installation of
-<application>Mageia</application>. This will format the root partition (/),
-but can preserve a separated /home partition.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Nadgradnja</para>
-
-      <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that has reached
-its End Of Life, then it is better to do a clean install instead while
-preserving your <literal>/home</literal> partition.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that, and only if you are very sure
-rebooting is what you want, go to a text terminal by pressing <guilabel>Alt
-Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the <emphasis role="bold">Install or Upgrade</emphasis>
-screen to the language choice screen by pressing <guilabel>Alt Ctrl
-Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do
-this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sl/selectKeyboard.xml b/docs/docs/stable/installer/sl/selectKeyboard.xml
index 816d91e0..5efa4e36 100644
--- a/docs/docs/stable/installer/sl/selectKeyboard.xml
+++ b/docs/docs/stable/installer/sl/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="sl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,19 +19,22 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Tipkovnica</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX selects an appropriate keyboard for your language. If no suitable
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX selects an appropriate keyboard for your language. If no suitable
 keyboard is found it will default to a US keyboard layout.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Make sure that the selection is correct or choose another keyboard
+      <para revision="1" xml:id="selectKeyboard-pa2">Make sure that the selection is correct or choose another keyboard
 layout. If you don't know which layout your keyboard has, look in the
 specifications that came with your system, or ask the computer vendor. There
 may even be a label on the keyboard that identifies the layout. You can also
@@ -27,23 +43,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a fuller list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this and
-continue the installation: the keyboard chosen from the full list will be
-applied.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
 extra dialogue screen asking how you would prefer to switch between the
 Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sl/selectKeyboardLive.xml b/docs/docs/stable/installer/sl/selectKeyboardLive.xml
index 315eae4e..72acceb4 100644
--- a/docs/docs/stable/installer/sl/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/sl/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Izbor tipkovnice</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>You will be required to set the keyboard layout you wish to use in
-Mageia​​. The default one is selected according to your language and
-timezone previously selected.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/sl/selectLanguage.xml b/docs/docs/stable/installer/sl/selectLanguage.xml
index 85d887c8..58cbc553 100644
--- a/docs/docs/stable/installer/sl/selectLanguage.xml
+++ b/docs/docs/stable/installer/sl/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sl" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,50 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Izberite jezik namestitve</title>
   </info>
 
-  <para condition="classical">Select your preferred language, by first expanding the list for your
-continent. <application>Mageia</application> will use this selection during
-the installation and for your installed system.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">If it is likely that you (or others) will require several languages to be
-installed on your system, then you should use the <guibutton>Multiple
-languages</guibutton> option to add them now. It will be difficult to add
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
 extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
+  <important condition="classical">
     <para>Even if you choose more than one language, you must first choose one as your
-preferred language in the first language screen. It will also be marked as
-chosen in the multiple languages screen .</para>
-  </warning>
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
       <para>If your keyboard language is not the same as your preferred language, then
-it is advisable to install the language of your keyboard as well.</para>
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia uses UTF-8 (Unicode) support by default.</para>
-
-      <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple
-languages</emphasis> screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>You can change the language of your system after installation in the Mageia
-Control Center -> System -> Manage localization for your system.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sl/selectMouse.xml b/docs/docs/stable/installer/sl/selectMouse.xml
index 6aee7dd8..bf01a94a 100644
--- a/docs/docs/stable/installer/sl/selectMouse.xml
+++ b/docs/docs/stable/installer/sl/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="sl">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Izberite miško</title>
   </info>
@@ -7,25 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">If you are not happy with how your mouse responds, you can select a
 different one here.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB
-mice</guilabel> is a good choice.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to
-configure the buttons that do not work on a mouse with six or more buttons.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/sl/setupBootloader.xml b/docs/docs/stable/installer/sl/setupBootloader.xml
index 4531af69..98b62a0f 100644
--- a/docs/docs/stable/installer/sl/setupBootloader.xml
+++ b/docs/docs/stable/installer/sl/setupBootloader.xml
@@ -1,146 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="sl" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="sl" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Glavne možnosti zagonskega nalagalnika</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Vmesnik zagonskega nalagalnika</title>
-    <para>By default, Mageia uses exclusively:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot
-choose between the <emphasis role="bold">with</emphasis> or <emphasis
-role="bold">without graphical menu</emphasis> options.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to house the bootloader
-(GRUB2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds GRUB2-efi. Although it is possible to have
-several ESPs, only one is required (and advised), whatever the number of
-operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Uporaba Magejinega zagonskega nalagalnika</title>
-    <para>By default, and according to your system, Mageia writes one of the
-following:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then untick the <emphasis
-role="bold">Probe Foreign OS </emphasis>option </para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
   <section>
-    <title>Uporaba obstoječega zagonskega nalagalnika</title>
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this documentation, however in most cases it will
-involve running the relevant bootloader installation program which should
-detect and add it automatically. See the documentation for the operating
-system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Možnosti</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>Prva stran</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you
-set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be required when booting
-to select a booting entry or change settings. The username is <emphasis
-role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will
-check that it matches with the one above.</para></listitem><listitem><para><guilabel>Napredno</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for power management. It can save energy by
-stopping unused devices.  Deselecting it could be useful if, for example,
-your computer does not support ACPI or if you think the ACPI implementation
-might cause some problems (for instance random reboots or system lockups).</para></listitem><listitem><para><guilabel>Enable SMP</guilabel>: This option enables/disables symmetric
-multiprocessing for multi core processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the operating system access to
-the Advanced Programmable Interrupt Controller. APIC devices permit more
-complex priority models, and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC manages all external
-interrupts for a specific processor in an SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Glavne možnosti zagonskega nalagalnika</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Naslednja stran</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Napredno</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-to be used by the boot menu. If you click the down triangle you will be
-offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Uporaba obstoječega zagonskega nalagalnika</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Add or Modify a Boot Menu Entry</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/setupSCSI.xml b/docs/docs/stable/installer/sl/setupSCSI.xml
index c9afbdad..f5e8b6ef 100644
--- a/docs/docs/stable/installer/sl/setupSCSI.xml
+++ b/docs/docs/stable/installer/sl/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="sl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Nastavitev naprav SCSI</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
 SCSI controllers it may be unable to determine the correct drivers to use
 and subsequently fail to recognise the drive.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s)
-you have.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">DrakX should then be able to configure the drive(s) correctly.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/sl/software.xml b/docs/docs/stable/installer/sl/software.xml
new file mode 100644
index 00000000..4fbf30b6
--- /dev/null
+++ b/docs/docs/stable/installer/sl/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="sl" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sl/soundConfig.xml b/docs/docs/stable/installer/sl/soundConfig.xml
index 657c107a..16405926 100644
--- a/docs/docs/stable/installer/sl/soundConfig.xml
+++ b/docs/docs/stable/installer/sl/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="sl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Nastavitve zvoka</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if one exists.</para>
+  
 
-  <para>The default driver should work without problems. However, if after install
-you do encounter problems, then run <command>draksound</command> or start
-this tool via MCC (Mageia Control Center), by choosing the
-<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound
-Configuration</guilabel> at the top right of the screen.</para>
+  
 
-  <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis
-role="bold">Sound Configuration</emphasis> tool screen, click on
-<guibutton>Troubleshooting</guibutton> to find useful advice about how to
-solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Napredno</title>
     </info>
 
-    <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in
-this screen, during install, is useful if there is no default driver and
-there are several drivers available, but you think the installer selected
-the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on <emphasis
-role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sl/takeOverHdConfirm.xml b/docs/docs/stable/installer/sl/takeOverHdConfirm.xml
index ea017780..95778de7 100644
--- a/docs/docs/stable/installer/sl/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/sl/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="sl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Potrdi formatiranje trdega diska</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is
-ok to erase every partition, every operating system and all data that might
-be on that hard disk.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/sl/testing.xml b/docs/docs/stable/installer/sl/testing.xml
index 60a2a560..feb9859e 100644
--- a/docs/docs/stable/installer/sl/testing.xml
+++ b/docs/docs/stable/installer/sl/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Preizkusite Magejo kot živ sistem</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Preizkusite Magejo kot živ sistem</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Živi način</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>You get this screen if you selected "Boot Mageia". If not, you get the
-"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Preizkus strojne opreme</title>
       </info>
 
-      <para>One of the Live mode goals is to test if the hardware is correctly managed
-by Mageia. You can check if all devices have a driver in the Hardware
-section of the Mageia Control Center. You can test the most current devices:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>graphical card: if you see the previous screen, it's already OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>Spletna kamera:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>printer: configure it and print a test page</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
       </itemizedlist>
 
-      <para>If all is OK for you, you can process to the installation. If not, you can
-leave with the quit button.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>The configuration settings you made here are kept for the installation.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,15 +68,14 @@ leave with the quit button.</para>
         <title xml:id="testing3-ti1">Zagon namestitve</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
-SSD drive, simply click on the icon "Install on Hard Disk". You will get
-this screen, and then the "<link
-linkend="doPartitionDisks">Partitioning</link> step" as for the direct
-installation.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/sl/uninstall-Mageia.xml b/docs/docs/stable/installer/sl/uninstall-Mageia.xml
index afe77cda..ac0da17e 100644
--- a/docs/docs/stable/installer/sl/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/sl/uninstall-Mageia.xml
@@ -1,30 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="sl">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sl" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Odstrani Magejo</title>
   </info>
 
   
 
+  
+
   <para>If Mageia didn't convince you or you can't install it correctly - in short
 you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-  <para>After your data backup, reboot your Mageia installation DVD and select
-<emphasis role="bold">Rescue system</emphasis>, then, <emphasis
-role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
-will only have Windows, with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>In Windows to recover the space used by Mageia partitions: click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code>. You will recognize a Mageia partition
-because they are labeled <guilabel>Unknown</guilabel>, and also by their
-size and place on the disk. Right click on each of these partitions and
-select <guibutton>Delete</guibutton> to free up the space.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
   <para>If you are using Windows XP, you can create a new partition and format it
-(FAT32 or NTFS). It will get a partition letter.</para>
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>If you have Vista or 7, you have one more possibility, you can extend the
 existing partition that is at the left of the freed space. There are other
@@ -32,4 +45,4 @@ partitioning tools that can be used, such as <emphasis
 role="bold">gparted</emphasis>, available for both Windows and Linux. As
 always, when changing partitions, be very careful to back up anything
 important to you.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sl/unused.xml b/docs/docs/stable/installer/sl/unused.xml
index 0ae8036e..927a3957 100644
--- a/docs/docs/stable/installer/sl/unused.xml
+++ b/docs/docs/stable/installer/sl/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sl" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="sl">
   <info>
     <title xml:id="unused-ti1">Keep or delete unused material</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para>In this step, the installer looks for unused locales packages and unused
-hardware packages. Then it proposes you to delete them. It is a good idea to
-accept, except if you prepare an installation which has to run on different
-hardware.</para>
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
+
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>The next step is the copying of files on hard disk. This takes some
-minutes. At the end, you get a blank screen for some time, it's normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/sq/DrakLive-cover.xml b/docs/docs/stable/installer/sq/DrakLive-cover.xml
index 9ced31e5..b825a645 100644
--- a/docs/docs/stable/installer/sq/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/sq/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="sq" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="sq" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Instalime nga mjedisi LIVE</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Janar 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Instalime nga mjedisi LIVE</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Dokumentacioni zyrtar për Mageia</para>
+      <para role="tagline">Dokumentacioni zyrtar për Mageia</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
+<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>Ky manual është prodhuar me ndihmën e <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ky manual është prodhuar me ndihmën e <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> zhvilluar nga <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-            </para>
-            <para>Është shkruar nga vullnetarë në kohën e tyre të lirë. Ju lutem kontaktoni
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Është shkruar nga vullnetarë në kohën e tyre të lirë. Ju lutem kontaktoni
 <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Ekipi
-Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para> 
+Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para>
     </cover>
   </info>
+
   <article>
     <title>Instalime nga mjedisi LIVE</title>
-       <para><note>
-          <para>Askush nuk do të shohë të gjitha ekranet instaluese që ju shihni në këtë
+
+    <para><note>
+        <para>Askush nuk do të shohë të gjitha ekranet instaluese që ju shihni në këtë
 manual. Cilat ekrane ju do të shihni, varet nga pjesët-elektronike tuaja dhe
 zgjedhjet që bëni gjatë instalimit.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/sq/DrakLive.xml b/docs/docs/stable/installer/sq/DrakLive.xml
index 7f415486..d0202d28 100644
--- a/docs/docs/stable/installer/sq/DrakLive.xml
+++ b/docs/docs/stable/installer/sq/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="sq" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="sq" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Instalime nga mjedisi LIVE</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Instalime nga mjedisi LIVE</title>
 
     <cover>
       <para><note>
@@ -17,9 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> zhvilluar nga <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
 
-      <para>Është shkruar nga vullnetarë në kohën e tyre të lirë. Ju lutem kontaktoni
-<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Ekipi
-Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë 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>
 
@@ -39,7 +54,12 @@ Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +69,18 @@ Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/sq/DrakX-cover.xml b/docs/docs/stable/installer/sq/DrakX-cover.xml
index b99ee71f..6ffd3c7a 100644
--- a/docs/docs/stable/installer/sq/DrakX-cover.xml
+++ b/docs/docs/stable/installer/sq/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="sq" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="sq" xml:id="Quick-Startup"
+      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>Instalim me DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Shkurt 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Shkurt 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Dokumentacioni zyrtar për Mageia</para>
+      <para role="tagline">Dokumentacioni zyrtar për Mageia</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
+
+      <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>Ky manual është prodhuar me ndihmën e <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Ky manual është prodhuar me ndihmën e <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> zhvilluar nga <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
-	    </para>
-            <para>Është shkruar nga vullnetarë në kohën e tyre të lirë. Ju lutem kontaktoni
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Është shkruar nga vullnetarë në kohën e tyre të lirë. Ju lutem kontaktoni
 <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Ekipi
-Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para> 
+Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Instalim me DrakX</title>
-       <para><note>
-          <para>Askush nuk do të shohë të gjitha ekranet instaluese që ju shihni në këtë
+
+    <para><note>
+        <para>Askush nuk do të shohë të gjitha ekranet instaluese që ju shihni në këtë
 manual. Cilat ekrane ju do të shihni, varet nga pjesët-elektronike tuaja dhe
 zgjedhjet që bëni gjatë instalimit.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ zgjedhjet që bëni gjatë instalimit.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/sq/DrakX-inline.xml b/docs/docs/stable/installer/sq/DrakX-inline.xml
new file mode 100644
index 00000000..dd77ebda
--- /dev/null
+++ b/docs/docs/stable/installer/sq/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="sq" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Instalim me DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>Askush nuk do të shohë të gjitha ekranet instaluese që ju shihni në këtë
+manual. Cilat ekrane ju do të shihni, varet nga pjesët-elektronike tuaja dhe
+zgjedhjet që bëni gjatë instalimit.</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>Ky manual është prodhuar me ndihmën e <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> zhvilluar nga <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+      <para>Është shkruar nga vullnetarë në kohën e tyre të lirë. Ju lutem kontaktoni
+<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Ekipi
+Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/DrakX.xml b/docs/docs/stable/installer/sq/DrakX.xml
index 7f82017e..52cb0b90 100644
--- a/docs/docs/stable/installer/sq/DrakX.xml
+++ b/docs/docs/stable/installer/sq/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="sq" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="sq" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Instalim me DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Instalim me DrakX</title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/sq/SelectAndUseISOs2.xml b/docs/docs/stable/installer/sq/SelectAndUseISOs2.xml
index cd7d9eb9..48fd6787 100644
--- a/docs/docs/stable/installer/sq/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/sq/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="sq" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Zgjidh dhe përdorë ISOs</title>
   </info>
   <section>
     <title>Paraqitje</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
-    <para>There are two families of media:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: Booting with this media provides you with the maximum
-flexibility when choosing what to install, and for configuring your
-system. In particular, you have a choice of which Desktop environment to
-install</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: This option allows you to try out Mageia without having to
-actually install it, or make any changes to your computer.  If the
-installation is decided, the process is simpler, but you get fewer choices
-than offered by the Classical installer</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Details are given in the next sections.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Media</title>
     <section>
       <title>Përcaktim</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support (DVD, USB
-stick, ...) the ISO file is copied to.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
@@ -43,24 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the Classical installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
             <para>They are used for performing clean installs or to upgrade a previously
-installed version of Mageia.</para>
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Some tools are available in the Welcome screen: Rescue System, Memory Test,
-Hardware Detection Tool.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Each DVD contains many available desktop environments and languages.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Ju do ju jepet zgjedhja gjatë instalimit të shtoni programe jo të lirë.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -72,21 +107,19 @@ Hardware Detection Tool.</para>
         <itemizedlist>
           <listitem>
             <para>Can be used to preview the Mageia operating system without having to install
-it. Can also be used to install Mageia if you wish.</para>
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade previously installed Mageia
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>They contain non free software.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -94,13 +127,13 @@ releases.</emphasis></para>
         <title>Live DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Plasma desktop environment only.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -108,13 +141,13 @@ releases.</emphasis></para>
         <title>Live DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>GNOME desktop environment only.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -122,13 +155,13 @@ releases.</emphasis></para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Xfce desktop environment only.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 or 64 bit architectures.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -139,22 +172,10 @@ releases.</emphasis></para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>These are minimal ISO's containing no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient if
-bandwidth is too low to download a full DVD, or if you have a PC without a
-DVD drive or is unable to boot from a USB stick.</para>
-          </listitem>
-          <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>First steps are English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -162,8 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -171,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains non-free software (mostly drivers, codecs...) for people who need
-it.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -184,16 +204,23 @@ it.</para>
       <title>Shkarkim</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, you are provided with some information, such as
-the mirror in use and an option to switch if the bandwidth is too low. If
-http is chosen, you will also see something regarding checksums.</para>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the
-other, and copy the checksum <link linkend="integrity">for later
-use</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
@@ -201,52 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
 algorithm from the file to be downloaded. You may compare the checksum of
 your downloaded ISO against that of the original source ISO. If the
 checksums do not match, it means that the actual data on the ISO's do not
-match, and if it is the case, then you should retry the download or attempt
-a repair using BitTorrent.</para>
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>To generate the checksum for your downloaded ISO, open a console, (no need
 to be root), and:</para>
       <itemizedlist>
         <listitem>
-          <para>To use md5sum, type: <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>To use sha1sum, type: <userinput>sha1sum
-path/to/the/image/file.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Example:</para>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Burn or dump the ISO</title>
-    <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
-stick. This is not a standard copy operation as a bootable medium will
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
 actually be created.</para>
     <section>
       <title>Burning the ISO to a CD/DVD</title>
-      <para>Whichever software you use, ensure that the option to burn an <emphasis
-role="bold">image</emphasis> is used, burn <emphasis
-role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not
-correct. See <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link> for more information.</para>
     </section>
     <section>
       <title>Dump the ISO to a USB stick</title>
-      <para>All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick
-and then use it to boot and install the system.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any existing data will be lost and the partition capacity will
-be reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>To recover the original capacity, you must redo partitioning and re-format
-the USB stick.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Using a graphical tool within Mageia</title>
         <para>You can use a graphical tool like <link
@@ -258,7 +296,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <itemizedlist>
           <listitem>
             <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -267,7 +305,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Using Command line within a GNU/Linux system</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk overwriting
 potentially valuable existing data if you specify the wrong target device.</para>
@@ -277,27 +315,27 @@ potentially valuable existing data if you specify the wrong target device.</para
             <para>Hap panel komandimi</para>
           </listitem>
           <listitem>
-            <para>Become a root (Administrator) user with the command <userinput>su
--</userinput> (don't forget the final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Plug in your USB stick (do not mount it, this also means do not open any
-application or file manager that could access or read it)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Shkruani komandën <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
             <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
             <para>Alternatively, you can find the device name with the command
-<code>dmesg</code>: towards the end of this example, you can see the device
-name starting with <emphasis>sd</emphasis>, and in this case,
-<emphasis>sdd</emphasis> is the actual device. You can also see that its
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
 size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
@@ -319,21 +357,22 @@ size is 2GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: <emphasis role="bold"># <userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Where X=your device name eg: /dev/sdd</para>
-            <para>Example:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-and <emphasis role="bold">of</emphasis> stands for <emphasis
-role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Shkruani komandën: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>This is the end of the process, and you may now unplug your USB stick.</para>
@@ -342,4 +381,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/acceptLicense.xml b/docs/docs/stable/installer/sq/acceptLicense.xml
index cdbfcf87..d5aa847b 100644
--- a/docs/docs/stable/installer/sq/acceptLicense.xml
+++ b/docs/docs/stable/installer/sq/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Liçenca dhe Shënime Lëshimit</title>
   </info>
 
@@ -46,19 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">Licenca e Pajtueshmërisë</title>
     </info>
 
-    <para>Para instalimit<application>Mageia</application>, ju lutemi lexoni kushtet e
-liçencës me kujdes.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Këto kushte dhe rregulla zbatohen për të gjithë shpërndarjet
-<application>Mageia</application> dhe duhet të pranohen para se mund të
-vazhdohet.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>To proceed, simply select <guilabel>Accept</guilabel> and then click on
-<guibutton>Next</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Nëse vendosni të mos e pranojë këto kushte, atëherë ne ju falënderoj për
-kërkimin. Klikoni <guibutton> Dil </guibutton> do të ristartoni kompjuterin
-tuaj.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -76,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Important information about this release of
-<application>Mageia</application> can be viewed by clicking on the
-<guibutton>Release Notes</guibutton> button.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/addUser.xml b/docs/docs/stable/installer/sq/addUser.xml
index 40439ec3..54b91125 100644
--- a/docs/docs/stable/installer/sq/addUser.xml
+++ b/docs/docs/stable/installer/sq/addUser.xml
@@ -1,32 +1,51 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sq" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Menaxher për Përdorues dhe Super-përdoruesin </title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Vendos Fjalëkalim administratori (root):</title>
     </info>
 
-    <para>It is advisable for all <application>Mageia</application> installations to
-set a <emphasis role="bold">superuser</emphasis> (administrator) password,
-usually called the <emphasis>root password</emphasis> in Linux. As you type
-a password into the top box a shield will change from red to yellow to green
-depending on the strength of the password. A green shield shows you are
-using a strong password. You need to repeat the same password in the box
-underneath, to check that the first entry was not mistyped.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>All passwords are case sensitive. It is best to use a mixture of letters
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
 (upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
@@ -36,43 +55,46 @@ underneath, to check that the first entry was not mistyped.</para>
       <title xml:id="enterUser-ti3">Fut një përdorues</title>
     </info>
 
-    <para>Add a user here. A regular user has fewer privileges than the <emphasis
-role="bold">superuser</emphasis> (root), but enough to use the internet,
-office applications or play games and anything else the average user might
-use their computer for.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Ikonë</guibutton>: nëse klikoni në këtë buton do të ndryshojë
-ikonën e përdoruesve.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Emri Vërtetë</guilabel>: Vendos emrin e vërtetë të përdoruesit në
-këtë kuti teksti.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use
-a version of the user's real name. <emphasis role="bold">The login name is
-case sensitive.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password</guilabel>: Type in the user password. There is a shield
-at the end of the text box that indicates the strength of the password. (See
-also <xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password (again)</guilabel>: Retype the user password DrakX will
-check that you have not mistyped the password.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Any users you added while installing Mageia, will have a home directory that
-is both read and write protected (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
@@ -82,32 +104,31 @@ management</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Menaxhim Përdoruesi Avancuar</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>The <guibutton>Advanced</guibutton> option allows you to edit further
-settings for the user you are adding.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
-<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis>
-and <emphasis role="bold">Sh</emphasis></para>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the <emphasis
-role="bold">user ID</emphasis> for any user you added in the previous
-screen. If you are unsure what the purpose of this is, then leave it blank.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sq/add_supplemental_media.xml b/docs/docs/stable/installer/sq/add_supplemental_media.xml
index f522b1a6..ad82820f 100644
--- a/docs/docs/stable/installer/sq/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/sq/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="sq">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Përzgjedhja Media (Konfiguro Plotësues Media Instalimi)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,43 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>Ky ekran ju shfaq listën e depove tashmë të njohura. Ju mund të shtoni
-burime të tjera për paketa, si një disk optik ose një burim i
-largët. Zgjedhja e burimit përcakton cilat paketa do të jenë në dispozicion
-gjatë hapave të ardhshëm.</para>
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Për një burim të rrjetit, ka dy hapa që duhet të ndiqni:</para>
 
   <orderedlist>
     <listitem>
-      <para>Zgjedhja dhe aktivizimi i rrjetit, nëse nuk bërë tashmë.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
       <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
 mirror, you have access to the selection of all repositories managed by
-Mageia, like the <emphasis role="bold">Nonfree</emphasis>, the <emphasis
-role="bold">Tainted</emphasis> repositories and the <emphasis
-role="bold">Updates</emphasis>. With the URL, you can designate a specific
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
 repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>If you are updating a 64 bit installation which may contain some 32 bit
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
 packages, it is advised to use this screen to add an online mirror by
-ticking one of the Network protocols here. The 64-bit DVD ISO only contains
-64-bit and noarch packages, it will not be able to update the 32-bit
-packages. However, after adding an online mirror, the installer will find
-the needed 32-bit packages there.</para>
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/ask_mntpoint_s.xml b/docs/docs/stable/installer/sq/ask_mntpoint_s.xml
index 818514b3..45448794 100644
--- a/docs/docs/stable/installer/sq/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/sq/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="sq">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Zgjidhni pikat montuese</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Këtu ju shihni ndarëset Linux që janë gjetur në kompjuterin tuaj. Nëse ju
-nuk pajtoheni me sugjerimet <application>DrakX</application>, ju mund të
-ndryshojë pikën e montimit.</para>
-
-  <note>
-    <para>If you change anything, make sure you still have a <emphasis
-role="bold"><literal>/</literal></emphasis> (root) partition.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis
-role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
-name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis>
-(for example, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>If you have several partitions, you can choose various different mount
-points from the drop down menu, such as <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis
-role="bold">/var</emphasis>. You can even make your own mount points, for
-instance <emphasis role="bold"><literal>/video</literal></emphasis> for a
-partition where you want to store your films, or <emphasis
-role="bold">/Data</emphasis> (or some other name) for your data.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -79,13 +82,17 @@ mount point field blank.</para>
   </itemizedlist>
 
   <warning>
-    <para>If you are not sure what to choose, click <emphasis
-role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
-disk partitioning</guilabel>, where, you can click on a partition to see its
-type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Nëse jeni të sigurt që pikat montuese janë të sakta, klikoni mbi
-<guibutton>Tjetër</guibutton>, dhe zgjidhni nëse ju vetëm dëshironi të
-formatoni ndarjen(s) DrakX sugjeruar, ose më shumë.</para>
-</section>
\ No newline at end of file
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/sq/bestTime.xml b/docs/docs/stable/installer/sq/bestTime.xml
index cbb22663..768de150 100644
--- a/docs/docs/stable/installer/sq/bestTime.xml
+++ b/docs/docs/stable/installer/sq/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sq" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="sq" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Cilësime ora</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>Në këtë hap, ju duhet të zgjidhni në cilën kohë ora juaj e brendshme është e
-vendosur, ose orës lokale ose orës UTC.</para>
-
-  <para>Në tab avancuar, ju do të gjeni më shumë opsione për parametrat e orës.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/bootLive.xml b/docs/docs/stable/installer/sq/bootLive.xml
index cc5a7d3f..5e183f7f 100644
--- a/docs/docs/stable/installer/sq/bootLive.xml
+++ b/docs/docs/stable/installer/sq/bootLive.xml
@@ -1,30 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="sq"><info><title xml:id="bootLive-ti1">Ndez Mageia si Sistem Live</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">Nga disku</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
-DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
-bootloader to launch the installation automatically after rebooting the
-computer. If that does not happen you may need to reconfigure your BIOS or
-press one key that will offer you to choose the peripheral from which the
-computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">Nga një pajisje USB</title></info><para>You can boot from the USB device on which you dumped your image
-ISO. According to your BIOS settings, the computer boots perhaps directly on
-the USB device already plugged in a port. If that does not happen you may
-need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Ekrani fillestarë gjatë ndezjes në mënyrë të BIOS</para></caption></mediaobject><para>Nl menynë e mesëm, ju kenë zgjedhjen e tre veprimeve:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
-or USB stick) without writing anything on the disk, so expect a very slow
-system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para></listitem><listitem><para>Instalo Magia: Kjo zgjedhje do të instalojë direkt Mageia në kompjuterin
-tuaj.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
-when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para></listitem></itemizedlist><para>Në menunë poshtë, janë opsionet Ndezëse:</para><itemizedlist><listitem><para>F1 - Ndihmë. Shpjegon mundësitë "splash", "apm", "acpi" dhe "Ide"</para></listitem><listitem><para>F2 - Gjuha. Përzgjedh gjuhën të shfaqur në ekran.</para></listitem><listitem><para>F3 - Rezolucioni ekranit. Zgjidh ndërmjet text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
-the inserted installation medium. Here, select other sources, like FTP or
-NFS servers. If the installation is carried out in a network with an SLP
-server, select one of the installation sources available on the server with
-this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
-optional disk with a driver update and will require its insertion during
-installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">Në mënyrë UEFI</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Ekrani fillestarë gjatë ndezjes në sistem UEFI nga disku</para></caption></mediaobject><para>Ju keni vetëm zgjedhjen për të lëshuar Mageia në mënyrë të jo instaluese
-(zgjedhja e parë), ose për të vazhduar me instalimin (zgjedhje e dytë).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
-duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para><para>Në çdo rast, hapat e parë do të jenë të njëjtë për të zgjedhur gjuhën,
-vendndodhjen dhe tastierën, pastaj proceset ndryshojnë, me <link
-linkend="testing"> hapa shtesë në mënyrë live</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Ndez Mageia si Sistem Live</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Booting the medium</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Ekrani fillestarë gjatë ndezjes në mënyrë të BIOS</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">Në mënyrë UEFI</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/sq/chooseDesktop.xml b/docs/docs/stable/installer/sq/chooseDesktop.xml
index 72b2be5d..c1752afc 100644
--- a/docs/docs/stable/installer/sq/chooseDesktop.xml
+++ b/docs/docs/stable/installer/sq/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sq" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Përzgjedhje Desktop</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Përzgjedhje Desktop</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide-show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> or <application>GNOME</application>
-desktop environment. Both come with a full set of useful applications and
-tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
-use both), or if you want to modify the default software choices for these
-desktop environments. The <application>LXDE</application> desktop, for
-instance, is lighter than the previous two, sporting less eye candy and
-fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/sq/choosePackageGroups.xml b/docs/docs/stable/installer/sq/choosePackageGroups.xml
index 224b5210..7245a662 100644
--- a/docs/docs/stable/installer/sq/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/sq/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sq" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sq" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Zgjidhni Grupet Paketave</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/sq/choosePackagesTree.xml b/docs/docs/stable/installer/sq/choosePackagesTree.xml
index 2dff7fe8..31776469 100644
--- a/docs/docs/stable/installer/sq/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/sq/choosePackagesTree.xml
@@ -1,22 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="sq">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="sq">
   <info>
     <title xml:id="choosePackagesTree-ti1">Zgjidhni paketat individuale</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-  <para>Pasi keni bërë zgjedhjen tuaj, ju mund të klikoni mbi <guibutton>ikonën
-floppy</guibutton> në fund të faqes për të ruajtur zgjedhjen tuaj të
-paketave (ruajtja në një USB punon gjithashtu). Ju pastaj mund të përdorin
-këtë skedë për të instaluar të njëjtat paketa në një sistem tjetër, duke
-shtypur butonin e njëjtë gjatë instalimit dhe të zgjedhni për të ngarkuar
-atë.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/configureServices.xml b/docs/docs/stable/installer/sq/configureServices.xml
index e9e712bc..add42c55 100644
--- a/docs/docs/stable/installer/sq/configureServices.xml
+++ b/docs/docs/stable/installer/sq/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sq" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="sq" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Konfiguro shërbimet tuaja</title>
   </info>
@@ -7,20 +7,31 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose are usually good.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">Nëse përzgjidhni një shërbim, disa informacione në lidhje me të janë shfaqur
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Nëse përzgjidhni një shërbim, disa informacione në lidhje me të janë shfaqur
 në kutinë info më poshtë.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Vetëm ndrysho gjërat, kur ju e dini shumë mirë se çfarë po bëni.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/configureTimezoneUTC.xml b/docs/docs/stable/installer/sq/configureTimezoneUTC.xml
index 94e0744c..b5861d4e 100644
--- a/docs/docs/stable/installer/sq/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/sq/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="sq">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="sq">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Konfiguro kohën-zonës tuaj</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the
-same time-zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
 or to GMT, also known as UTC.</para>
diff --git a/docs/docs/stable/installer/sq/configureX_card_list.xml b/docs/docs/stable/installer/sq/configureX_card_list.xml
index 99852091..c2e7546c 100644
--- a/docs/docs/stable/installer/sq/configureX_card_list.xml
+++ b/docs/docs/stable/installer/sq/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="sq">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Zgjidhni një X Server (Konfiguro Kartën tuaj Grafike)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX ka një bazë të dhënash shumë të plotë të kartave video dhe zakonisht
 do të identifikojë saktë pajisjen video tuaj.</para>
@@ -29,33 +42,34 @@ do të identifikojë saktë pajisjen video tuaj.</para>
   <para>Nëse instaluesi nuk ka zbuluar kartën tuaj grafike të saktë dhe ju e dini
 cilën keni, ju mund të zgjidhni atë nga pema nga: <itemizedlist>
       <listitem>
-        <para>shitës</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>atëherë emrin e kartës tuaj</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>dhe lloji i kartës</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-<emphasis role="bold">Xorg</emphasis> category, which provides more than 40
-generic and open source video card drivers. If you still can't find a
-specific driver for your card there is the option of using the <emphasis
-role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the <emphasis role="bold">Command-line</emphasis> Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the <emphasis role="bold">Nonfree</emphasis>
-repository and in some cases only from the card manufacturers' websites.</para>
-
-  <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be
-explicitly enabled to access them. If you didn't enable it previously, you
-should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/sq/configureX_chooser.xml b/docs/docs/stable/installer/sq/configureX_chooser.xml
index 6ff97198..4e7e5103 100644
--- a/docs/docs/stable/installer/sq/configureX_chooser.xml
+++ b/docs/docs/stable/installer/sq/configureX_chooser.xml
@@ -1,62 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="sq">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Karta Grafike dhe Konfigurimi Monitorit</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym> or any other graphical environment to work well, the
-following <acronym>X</acronym> settings need to be correct. Choose the
-correct settings if none are shown, or if you think the details are
-incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Karta Grafike</guibutton></emphasis>: Zgjidhni kartën
-tuaj nga lista nëse është e nevojshme.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from
-the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose
-<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and
-vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Normat e pasakta Rifresko mund të dëmtojë monitoruar tuaj</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and
-color depth of your monitor can be set here.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the option is there, and you test your
-settings, you should be ask whether your settings are correct. If you answer
-<emphasis role="bold">yes</emphasis>, the settings will be kept. If you
-don't see anything, you'll return to the configuration screen and be able to
-reconfigure everything until the test result is satisfactory. If the test
-option is not available, then make sure your settings are on the safe side.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Opsione</guibutton></emphasis>: Këtu ju mund të
-zgjidhni të mundësoni ose çaktivizoni opsionet e ndryshme.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/sq/configureX_monitor.xml b/docs/docs/stable/installer/sq/configureX_monitor.xml
index d6d2d3d5..afc15a31 100644
--- a/docs/docs/stable/installer/sq/configureX_monitor.xml
+++ b/docs/docs/stable/installer/sq/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="sq">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,65 +23,83 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Zgjidhni Monitorin tuaj</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX ka një bazë të dhënash shumë të plotë të vëzhguesve dhe zakonisht do
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX ka një bazë të dhënash shumë të plotë të vëzhguesve dhe zakonisht do
 të identifikojë saktë tuajat.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
 could damage your monitor or video hardware. Please don't try something
 without knowing what you are doing.</emphasis> If in doubt you should
 consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Personalizuar</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Ky opsion ju lejon të vendosni dy parametra kritike, normën vertikale
-rifresko dhe shkalla horizontale sinkronizim. Rifresko Vertikal përcakton se
-sa shpesh në ekran është rifreskuar dhe sinkronizuar horizontalisht është
-shkalla në të cilën linjat skanuara janë shfaqur.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">Është <emphasis>SHUMË E RËNDËSISHME</emphasis> që ju të mos specifikoni një
+        <para revision="1" xml:id="configureX_monitor-pa4">Është <emphasis>SHUMË E RËNDËSISHME</emphasis> që ju të mos specifikoni një
 lloj monitori me një gamë të sinkronizume që është përtej aftësive të
 monitoruar tuaj: ju mund të dëmtoni monitoruar tuaj. Nëse në dyshim,
 zgjidhni një mjedis konservator dhe konsultohuni me dokumentacionin tuaj të
 monitorit.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Fute 'e Hap</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">Kjo është alternativa e parazgjedhur dhe përpiqet për të përcaktuar llojin
-monitorit nga baza e të dhënave monitorëve.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Shitës</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">Nëse instaluesi nuk e ka zbuluar saktësisht monitoruar tuaj dhe ju e dini
-cilin ju keni, ju mund të zgjidhni atë nga pema duke përzgjedhur: <itemizedlist>
       <listitem>
-        <para>shitës</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>emri i prodhuesit të monitoruar</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>përshkrimi monitorit</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Nëse instaluesi nuk e ka zbuluar saktësisht monitoruar tuaj dhe ju e dini
+cilin ju keni, ju mund të zgjidhni atë nga pema duke përzgjedhur:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Përgjithshëm</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the <emphasis
-role="bold">Vesa</emphasis> card driver when your video hardware cannot be
-determined automatically. Once again it may be wise to be conservative in
-your selections.</para>
-</section>
\ No newline at end of file
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/sq/diskPartitioning.xml b/docs/docs/stable/installer/sq/diskPartitioning.xml
new file mode 100644
index 00000000..99dbccc1
--- /dev/null
+++ b/docs/docs/stable/installer/sq/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="sq" version="5.0" xml:lang="sq">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/diskdrake.xml b/docs/docs/stable/installer/sq/diskdrake.xml
index 87388a6c..dd305a14 100644
--- a/docs/docs/stable/installer/sq/diskdrake.xml
+++ b/docs/docs/stable/installer/sq/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sq" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Ndrysho shpërndarjet e diskut me DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis>
-partition you must ensure that you have a separate <emphasis
-role="bold">/boot</emphasis> partition. The encryption option for the
-<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise
-your system will be unbootable.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view their details before you start.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage
-device like a USB key). In the screen-shot above there are two available
-devices: <emphasis role="bold">sda </emphasis>and <emphasis
-role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if
-you are sure you want to wipe all partitions on the selected storage device.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Expert mode</guibutton> provides more options such as a label
-(give a name to) a partition, or to choose a partition type.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Kliko<guibutton>e Bërë</guibutton> kur ju jeni gati.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
-Partition) is present and correctly mounted on /boot/EFI (see below)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/sq/doPartitionDisks.xml b/docs/docs/stable/installer/sq/doPartitionDisks.xml
index 00855c28..8d3ddd2f 100644
--- a/docs/docs/stable/installer/sq/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/sq/doPartitionDisks.xml
@@ -1,173 +1,214 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sq" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Shpërndarja</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the
-DrakX partitioning proposals for where to install
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the
-layout and content of your particular hard drive(s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Përdor ndarjet ekzistuese</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">Nëse ky opsion është në dispozicion, atëherë ndarjet ekzistuese Linux në
+      <para revision="1" xml:id="doPartitionDisks-pa5">Nëse ky opsion është në dispozicion, atëherë ndarjet ekzistuese Linux në
 përputhje janë gjetur dhe mund të përdoren për instalimin.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Përdor Hapësirën e Lirë</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">Nëse ju keni hapësirë ​​të papërdorur në disk drive tuaj atëherë ky opsion
+      <para revision="1" xml:id="doPartitionDisks-pa7">Nëse ju keni hapësirë ​​të papërdorur në disk drive tuaj atëherë ky opsion
 do të përdorë atë për instalimin tuaj të ri Mageia.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Përdore Hapësirën e Lirë në Ndarjen Windows</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">Nëse ju keni hapësirë ​​të papërdorur në një ndarje ekzistuese të Windows,
-instaluesi mund të ofrojë ta përdorni atë.</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">Kjo mund të jetë një mënyrë e dobishme për të bërë vend për instalimin tuaj
-të ri Mageia, por është një operacion i rrezikshëm kështu që ju duhet të
-jeni të sigurte që ju keni ruajtur rezervë gjitha dosjet e rëndësishme!</para>
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Vini re se kjo përfshin pakësimin madhësinë e ndarjes Windows. Ndarja duhet
 të jetë "e pastër", që do të thotë që Windows duhet të jenë mbyllur në
 mënyrë korrekte herën e fundit që është përdorur. Ajo duhet të ketë qenë
 de-fragmentuar, edhe pse kjo nuk është një garanci që të gjitha dosjet në
 ndarje janë zhvendosur nga zona që është gati për t'u përdorur. Është shumë
 e rekomanduar për të ruajtur dosjet tuaja personale rezervë.</para>
+      </important>
+    </listitem>
 
-        <para>With this option, the installer displays the remaining Windows partition in
-light blue and the proposed Mageia partition in dark blue with their
-intended sizes just underneath. You have the option to modify these sizes by
-clicking and dragging the gap between both partitions. See the following
-screen-shot.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Fshi dhe të përdor të Gjithë Diskun.</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">This option will allocate the entire drive for Mageia.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Shënim! Kjo do të fshijë të gjitha të dhënat në hard diskun e
-zgjedhur. Kujdes!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">Kjo ju jep kontroll të plotë mbi vendosjen e instalimit në hard-disqet(s)
+tuaja.</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">Nëse keni ndërmend të përdorni një pjesë të diskut për diçka tjetër, ose ju
-tashmë keni të dhënat në disk që ju nuk jeni të përgatitur për të humbur,
-atëherë mos e përdorni këtë opsion.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Shpërndarje e personalizuar</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">Kjo ju jep kontroll të plotë mbi vendosjen e instalimit në hard-disqet(s)
-tuaja.</para>
-      </listitem>
-    </itemizedlist></para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para>If you are not using the <emphasis role="bold">Custom disk
-partitioning</emphasis> option, the installer will allocate the available
-space according to the following rules:</para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>If the total available space is less than 50 GB, then only one partition is
-created. This will be the <emphasis role="bold">/</emphasis> (root)
-partition.</para>
-      </listitem>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-      <listitem>
-        <para>If the total available space is greater than 50 GB, then three partitions
-are created</para>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 of the total available place is allocated to <emphasis
-role="bold">/</emphasis> with a maximum of 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 është ndarë për swap me një maksimum prej 4GB</para>
-          </listitem>
-
-          <listitem>
-            <para>the rest (at least 12/19) is allocated to <emphasis
-role="bold">/home.</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-  <para>That means that from 160 GB or greater available space, the installer will
-create three partitions: 50 GB for <emphasis role="bold">/</emphasis>, 4 GB
-for <emphasis role="bold">swap</emphasis> and the remainder for <emphasis
-role="bold">/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
-automatically detected - or created if it does not exist yet, and mounted on
-/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to
-create a BIOS boot partition if not already existing. It is a roughly 1 MiB
-partition with no mount point. Choose <xref linkend="diskdrake"/> to be able
-to create it with the Installer like any other partition, just select BIOS
-boot partition as the filesystem type.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512. Due to lack of available hardware, the
 partitioning tool used in the installer has not been tested with such a
-drive. Also some SSD devices now use an erase block size over 1 MB. If you
-have such a device we suggest that you partition the drive in advance, using
-an alternative partitioning tool like <emphasis
-role="bold">gparted</emphasis>, and to use the following settings:</para>
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/sq/exitInstall.xml b/docs/docs/stable/installer/sq/exitInstall.xml
index a7f4c622..08a561ad 100644
--- a/docs/docs/stable/installer/sq/exitInstall.xml
+++ b/docs/docs/stable/installer/sq/exitInstall.xml
@@ -5,23 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">Ju keni përfunduar instalimin dhe konfigurimin
-<application>Mageia</application> dhe tani është e sigurt për të hequr të
-diskun e instalimit dhe të rifilloni kompjuterin tuaj.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems (if there are more than one) on your computer.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">Nëse ju nuk e keni të rregulluar parametrat për ngarkuesin-ndezës, instalimi
 juaj Mageia do të përzgjidhet automatikisht dhe filloi.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Kënaquni!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Vizito www.mageia.org nëse keni ndonjë pyetje ose dëshironi të kontribuoni
-në Mageia</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/firewall.xml b/docs/docs/stable/installer/sq/firewall.xml
index afee3722..d9beb9d5 100644
--- a/docs/docs/stable/installer/sq/firewall.xml
+++ b/docs/docs/stable/installer/sq/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="sq">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="sq" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Mur i Zjarrt</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Mur i Zjarrt</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
   <para>In the default setting (no button is checked), no service of the system is
-accessible from the network. The <emphasis role="bold">Everything (no
-firewall)</emphasis> enables access to all services of the machine - an
-option that does not make much sense in the context of the installer since
-it would create a totally unprotected system. Its veritable use is in the
-context of the Mageia Control Center (which uses the same GUI layout) for
-temporarily disabling the entire set of firewall rules for testing and
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
 debugging purposes.</para>
 
   <para>All other options are more or less self-explanatory. As an example, you will
-enable the <emphasis role="bold">CUPS server</emphasis> if you want printers
-on your machine to be accessible from the network.</para>
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where
-you can enable a series of services by typing a list of couples (blank
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
diff --git a/docs/docs/stable/installer/sq/formatPartitions.xml b/docs/docs/stable/installer/sq/formatPartitions.xml
index 2b693fb8..9fd42b19 100644
--- a/docs/docs/stable/installer/sq/formatPartitions.xml
+++ b/docs/docs/stable/installer/sq/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="sq">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Ndarjet</title>
   </info>
@@ -11,32 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
 partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Zakonisht të paktën ndarësja e zgjedhur DrakX duhet të jetë e formatuar</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Kliko në <guibutton>Përparuar</guibutton> për të zgjedhur ndarësen ju doni
-të kontrolloni për të ashtuquajturën  <emphasis>blloqe të këqija</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen,
-where you can choose to view details of your partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">Kur ju jeni të sigurt në lidhje me zgjedhjen, klikoni mbi
-<guibutton>Tjetër</guibutton> për të vazhduar.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/sq/graphicalConfiguration.xml b/docs/docs/stable/installer/sq/graphicalConfiguration.xml
new file mode 100644
index 00000000..dc322bb9
--- /dev/null
+++ b/docs/docs/stable/installer/sq/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/sq/installUpdates.xml b/docs/docs/stable/installer/sq/installUpdates.xml
index 57cd2da5..a685048c 100644
--- a/docs/docs/stable/installer/sq/installUpdates.xml
+++ b/docs/docs/stable/installer/sq/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="sq">
-  <info>
-    <title xml:id="installUpdates-ti1">Përditësime</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Përditësime</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Që nga ky version i <application>Mageia</application> u lirua, disa paketa
-duhet të ishin përditësime apo përmirësuar.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them,
-select <guilabel>No</guilabel> if you don't want to do this now, or if you
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
 aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Press <guibutton>Next</guibutton> to continue</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/installer.xml b/docs/docs/stable/installer/sq/installer.xml
index 1db3c035..ea31c0d1 100644
--- a/docs/docs/stable/installer/sq/installer.xml
+++ b/docs/docs/stable/installer/sq/installer.xml
@@ -6,166 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, instaluesi Mageia</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, instaluesi Mageia</title>
   </info>
 
   <para>Nëse jeni të ri në GNU-Linux apo një përdorues me përvojë, instaluesi Mageia
 është projektuar për të ndihmuar të bëjë instalimin tuaj ose përditsimin sa
 më lehtë të jetë e mundur.</para>
 
-  <para>Meny ekranit fillestar ka opsione të ndryshme, gjithsesi i paracaktuaro do
-të fillojë instaluesin, i cili normalisht do të jetë gjithçka që ju do të
-keni nevojë.</para>
+  <section>
+    <title>Hapat e instalimit</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Pamja Fillestare Instalimit</title>
 
-    <section>
-      <title>Using a Mageia DVD</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>From this screen, you have access to options by pressing "<emphasis
-role="bold">e</emphasis>" to enter the edit mode. To come back to this
-screen, press either <emphasis role="bold">Esc</emphasis> key to quit
-without saving or press the key <emphasis role="bold">Ctrl</emphasis> or
-<emphasis role="bold">F10</emphasis> to quit with saving.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, it is possible to set some preferences (note that the
-options <emphasis role="bold">F1</emphasis> to <emphasis
-role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist>
-          <listitem>
-            <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis
-role="bold">F6</emphasis> options, you can view relevant help by pressing
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a
-specific language for the installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>If needed, change the screen resolution by pressing <emphasis
-role="bold">F3</emphasis> (Legacy mode only).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis role="bold">F6</emphasis> <emphasis
-role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis
-role="bold">e</emphasis> instead).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Default: It doesn't alter anything in the default options.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: Priority is given to the safer options at the price of a
-performance detriment.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI: (Advanced Configuration and Power Interface): Power management
-features are not used.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU
-interrupt. Select this option if you experience system misbehaviour like a
-kernel panic in relation to APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>When you select one of these entries, it modifies the default options
-displayed in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with
-<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot
-Options</guilabel> line, despite this, they will in fact be applied.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various
-boot options. Select an item with the arrow keys and press <emphasis
-role="bold">Enter</emphasis> for more details or press <emphasis
-role="bold">Esc</emphasis> to go back to the welcome screen.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>The detailed view about the splash option. Press <emphasis
-role="bold">Esc</emphasis> or select <guilabel>Return to Boot
-Options</guilabel> to go back to the options list. These options can be
-added by hand in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>For more information about kernel options on legacy and UEFI systems, see:
-<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>Hapat e instalimit</title>
+    <section>
+      <title>UEFI Systems</title>
 
-    <para>The install process is divided into a number of steps, the status of which
-is indicated in a panel to the left of the screen.</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
-options.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
-about the particular step.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
-is possible to reboot, but please think twice before you do this. Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -176,19 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>Pas ekranin fillestar ju nuk keni arritur në ekran përzgjedhjes gjuhës. Kjo
-mund të ndodhë me disa karta grafike dhe sistemet e vjetra. Provoni të
-përdorni rezolutë të ulët duke shtypur <code>vgalo</code> në komandë.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this press <emphasis role="bold">Esc</emphasis> at the first welcome screen
-and confirm with <emphasis role="bold">ENTER</emphasis>. You will be
-presented with a black screen with the word "boot:". Type "text" and press
-<emphasis role="bold">ENTER</emphasis> to continue with the installation in
-text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -196,11 +195,11 @@ text mode.</para>
     <section>
       <title>Instaluesi Ngrin</title>
 
-      <para>Nëse sistemi shfaq ngrirëje gjatë instalimit, kjo mund të jetë një problem
-me zbulimin e pjesve elektronike. Në këtë rast zbulimin automatik të
-pajisjeve mund të jetë anashkaluar dhe të trajtohen më vonë. Për të provuar
-këtë, shkruaj <code>noauto</code> në ekran. Ky opsion mund të kombinohet me
-opsione të tjera të nevojshme.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -208,17 +207,18 @@ opsione të tjera të nevojshme.</para>
 
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Ndarjet dinamike</title>
 
-      <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis>
-format to <emphasis role="bold">dynamic</emphasis> format in Microsoft
-Windows, then it is not possible to install Mageia on this disc. To revert
-to a basic disk, see the Microsoft documentation: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/sq/locale.xml b/docs/docs/stable/installer/sq/locale.xml
new file mode 100644
index 00000000..958e096f
--- /dev/null
+++ b/docs/docs/stable/installer/sq/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/sq/login.xml b/docs/docs/stable/installer/sq/login.xml
index ed85398b..280fc02a 100644
--- a/docs/docs/stable/installer/sq/login.xml
+++ b/docs/docs/stable/installer/sq/login.xml
@@ -1,5 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="sq"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
-yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para><para>Ju mund ti gjeni <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">këtu</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="sq">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/media_selection.xml b/docs/docs/stable/installer/sq/media_selection.xml
index 7e96ee9e..c7ef521a 100644
--- a/docs/docs/stable/installer/sq/media_selection.xml
+++ b/docs/docs/stable/installer/sq/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="sq">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Media Selection (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Këtu keni listën e depove në dispozicion. Jo të gjitha depot janë në
 dispozicion, sipas të cilit media që ju përdorni për të instaluar. Zgjedhja
@@ -35,7 +44,7 @@ bazën e shpërndarjes.</para>
       <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
 free-of-charge, i.e. Mageia may redistribute them, but they contain
 closed-source software (hence the name - Nonfree). For example this
-repository includes nVidia and ATI graphics card proprietary drivers,
+repository includes nVidia and AMD graphics card proprietary drivers,
 firmware for various WiFi cards, etc.</para>
     </listitem>
 
diff --git a/docs/docs/stable/installer/sq/minimal-install.xml b/docs/docs/stable/installer/sq/minimal-install.xml
index 97adc34b..0b972f3a 100644
--- a/docs/docs/stable/installer/sq/minimal-install.xml
+++ b/docs/docs/stable/installer/sq/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="sq">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="sq">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Instalim Minimal</title>
   </info>
@@ -10,26 +13,40 @@
 
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
-  <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+  
 
-  <para>Minimal Installation is intended for those with specific uses in mind for
-<application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the <emphasis
-role="bold">Individual package selection</emphasis> option mentioned above,
-to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>If you choose this installation method, then the relevant screen will offer
-you a few useful extras to install, such as documentation and X.</para>
+  
 
-  <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
 lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para>The basic documentation is provided in the form of man and info pages.  It
-contains the man pages from the <link
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
 Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
diff --git a/docs/docs/stable/installer/sq/misc-params.xml b/docs/docs/stable/installer/sq/misc-params.xml
index 910c3c01..e90ad6f5 100644
--- a/docs/docs/stable/installer/sq/misc-params.xml
+++ b/docs/docs/stable/installer/sq/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sq" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Summary of miscellaneous parameters</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
 
   <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
 the choices you made and on the hardware detected. You can check the
 settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>As a general rule, it is recommended that you accept the default settings
@@ -26,7 +42,7 @@ unless:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>some other factor mentionned in the detailed sections below is an issue.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,46 +54,47 @@ unless:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Kohëzone</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
 can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Shteti / Rajoni</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
 setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Ngarkues-ndezës</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX has made good choices for the bootloader setting.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Për më shumë informacion, shih <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Menaxhim përdoruesi</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each get their own
-<literal>/home</literal> directories.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Shërbimet</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
 (daemons).  This tool allows you to enable or disable certain processes.</para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Ju duhet të kontrolloni me kujdes para se të ndryshoni ndonjë gjë këtu - një
-gabim mund të parandoj kompjuterin tuaj së punuari saktë.</para>
-
-        <para>Për më shumë informacione, shih <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -89,7 +106,7 @@ gabim mund të parandoj kompjuterin tuaj së punuari saktë.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Tastierë</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
 of keyboard.</para>
@@ -101,27 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Miu</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add or configure other pointing devices, tablets, trackballs
 etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Karta Zërit</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The
-option to select a different driver is only given when there is more than
-one driver for your card, but where none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Ndërfaqe Grafike</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Ky seksion ju lejon të konfiguroni kartën tuaj grafike(s) dhe ekranin.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Për më shumë informacione, shih <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -136,11 +158,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Rrjeti</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, using the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
@@ -150,14 +172,14 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxies</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
         <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
-internet.  This section allows you to configure your computer to utilize a
+Internet.  This section allows you to configure your computer to utilize a
 proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -169,27 +191,31 @@ need to enter here.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Niveli Sigurisë</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Here you set the Security level for your computer, in most cases the default
-setting (Standard) is adequate for general use.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Kontrolloni opsionin i cili përshtatet më mirë përdorimit tuaj.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Muri-Mbrojtës</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">A firewall is intended to be a barrier between your important data and the
-rascals out there on the internet who would compromise or steal it.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Të ketë parasysh se duke e lejuar çdo gjë (nuk ka mure-mbrojtës), mund të
-jetë shumë e rrezikshme.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/sq/reboot.xml b/docs/docs/stable/installer/sq/reboot.xml
index bfcef4fa..10219c9b 100644
--- a/docs/docs/stable/installer/sq/reboot.xml
+++ b/docs/docs/stable/installer/sq/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="sq" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Rinise (riboot)</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/sq/securityLevel.xml b/docs/docs/stable/installer/sq/securityLevel.xml
index 6009f379..4fb91eb8 100644
--- a/docs/docs/stable/installer/sq/securityLevel.xml
+++ b/docs/docs/stable/installer/sq/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sq" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Niveli Sigurisë</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended
-setting for the average user. The <emphasis role="bold">Secure</emphasis>
-setting will create a highly protected system - for instance if the system
-is to be used as a public server.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Security Administrator</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
 which require notification to a system administrator.</para>
 
-  <para>A good, and easy-to-implement, choice is to enter &lt;user>@localhost -
-where &lt;user> is the login name of the user to receive these messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
 be configured for receiving such mail!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/sq/selectCountry.xml b/docs/docs/stable/installer/sq/selectCountry.xml
index c3d6a217..6688393a 100644
--- a/docs/docs/stable/installer/sq/selectCountry.xml
+++ b/docs/docs/stable/installer/sq/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="sq">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="sq">
   <info>
     <title xml:id="selectCountry-ti1">Zgjidhni Shtetin tuaj / Rajonin</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> option and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem that a country from the
-first list was chosen. Please ignore this, as DrakX will apply your actual
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,7 +40,7 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Metodë hyrëse</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
@@ -39,9 +50,9 @@ selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via <emphasis role="bold">Configure
-your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
-running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/selectInstallClass.xml b/docs/docs/stable/installer/sq/selectInstallClass.xml
index 1abc227f..0035d003 100644
--- a/docs/docs/stable/installer/sq/selectInstallClass.xml
+++ b/docs/docs/stable/installer/sq/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="sq" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Instalo ose Azhurno</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Instalo</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option to perform a fresh installation of
-<application>Mageia</application>. This will format the root partition (/),
-but can preserve a separated /home partition.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Azhurno</para>
-
-      <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that has reached
-its End Of Life, then it is better to do a clean install instead while
-preserving your <literal>/home</literal> partition.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that, and only if you are very sure
-rebooting is what you want, go to a text terminal by pressing <guilabel>Alt
-Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the <emphasis role="bold">Install or Upgrade</emphasis>
-screen to the language choice screen by pressing <guilabel>Alt Ctrl
-Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do
-this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sq/selectKeyboard.xml b/docs/docs/stable/installer/sq/selectKeyboard.xml
index dfe65a29..82ef2799 100644
--- a/docs/docs/stable/installer/sq/selectKeyboard.xml
+++ b/docs/docs/stable/installer/sq/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="sq">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,19 +19,22 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Tastiera</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX selects an appropriate keyboard for your language. If no suitable
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX selects an appropriate keyboard for your language. If no suitable
 keyboard is found it will default to a US keyboard layout.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Make sure that the selection is correct or choose another keyboard
+      <para revision="1" xml:id="selectKeyboard-pa2">Make sure that the selection is correct or choose another keyboard
 layout. If you don't know which layout your keyboard has, look in the
 specifications that came with your system, or ask the computer vendor. There
 may even be a label on the keyboard that identifies the layout. You can also
@@ -27,23 +43,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a fuller list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this and
-continue the installation: the keyboard chosen from the full list will be
-applied.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
 extra dialogue screen asking how you would prefer to switch between the
 Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sq/selectKeyboardLive.xml b/docs/docs/stable/installer/sq/selectKeyboardLive.xml
index 5154a895..11e055b0 100644
--- a/docs/docs/stable/installer/sq/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/sq/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sq" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Select keyboard</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>You will be required to set the keyboard layout you wish to use in
-Mageia​​. The default one is selected according to your language and
-timezone previously selected.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/sq/selectLanguage.xml b/docs/docs/stable/installer/sq/selectLanguage.xml
index c80f0cd4..358bc3b0 100644
--- a/docs/docs/stable/installer/sq/selectLanguage.xml
+++ b/docs/docs/stable/installer/sq/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sq" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,50 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Ju lutemi zgjidhni një gjuhë për të përdorur</title>
   </info>
 
-  <para condition="classical">Zgjidhni gjuhën tuaj të preferuar, duke parë zgjerimin e listës për
-kontinentit tuaj. <application>Mageia</application> do të përdorë këtë
-përzgjedhje gjatë instalimit dhe për të instaluar sistemin tuaj.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">If it is likely that you (or others) will require several languages to be
-installed on your system, then you should use the <guibutton>Multiple
-languages</guibutton> option to add them now. It will be difficult to add
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
 extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
+  <important condition="classical">
     <para>Even if you choose more than one language, you must first choose one as your
-preferred language in the first language screen. It will also be marked as
-chosen in the multiple languages screen.</para>
-  </warning>
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
       <para>If your keyboard language is not the same as your preferred language, then
-it is advisable to install the language of your keyboard as well.</para>
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia uses UTF-8 (Unicode) support by default.</para>
-
-      <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple
-languages</emphasis> screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>You can change the language of your system after installation in the Mageia
-Control Center -> System -> Manage localization for your system.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sq/selectMouse.xml b/docs/docs/stable/installer/sq/selectMouse.xml
index ed44bca6..6e6a9dbe 100644
--- a/docs/docs/stable/installer/sq/selectMouse.xml
+++ b/docs/docs/stable/installer/sq/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="sq">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Zgjidh miun</title>
   </info>
@@ -7,25 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">If you are not happy with how your mouse responds, you can select a
 different one here.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB
-mice</guilabel> is a good choice.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to
-configure the buttons that do not work on a mouse with six or more buttons.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/sq/setupBootloader.xml b/docs/docs/stable/installer/sq/setupBootloader.xml
index 8739fe3a..b4b78914 100644
--- a/docs/docs/stable/installer/sq/setupBootloader.xml
+++ b/docs/docs/stable/installer/sq/setupBootloader.xml
@@ -1,146 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="sq" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="sq" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Opsionet kryesore të programit Bootloader</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Bootloader interface</title>
-    <para>By default, Mageia uses exclusively:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot
-choose between the <emphasis role="bold">with</emphasis> or <emphasis
-role="bold">without graphical menu</emphasis> options.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to house the bootloader
-(GRUB2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds GRUB2-efi. Although it is possible to have
-several ESPs, only one is required (and advised), whatever the number of
-operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Using a Mageia bootloader</title>
-    <para>By default, and according to your system, Mageia writes one of the
-following:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then untick the <emphasis
-role="bold">Probe Foreign OS</emphasis> option.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
   <section>
-    <title>Using an existing bootloader</title>
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this documentation, however in most cases it will
-involve running the relevant bootloader installation program which should
-detect and add it automatically. See the documentation for the operating
-system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Opcionet</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>First page</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you
-set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be required when booting
-to select a booting entry or change settings. The username is <emphasis
-role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will
-check that it matches with the one above.</para></listitem><listitem><para><guilabel>Advanced</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for power management. It can save energy by
-stopping unused devices.  Deselecting it could be useful if, for example,
-your computer does not support ACPI or if you think the ACPI implementation
-might cause some problems (for instance random reboots or system lockups).</para></listitem><listitem><para><guilabel>Enable SMP</guilabel>: This option enables/disables symmetric
-multiprocessing for multi core processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the operating system access to
-the Advanced Programmable Interrupt Controller. APIC devices permit more
-complex priority models, and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC manages all external
-interrupts for a specific processor in an SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Opsionet kryesore të programit Bootloader</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Next page</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-to be used by the boot menu. If you click the down triangle you will be
-offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Using an existing bootloader</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Add or Modify a Boot Menu Entry</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/setupSCSI.xml b/docs/docs/stable/installer/sq/setupSCSI.xml
index dd83df97..9f58cbef 100644
--- a/docs/docs/stable/installer/sq/setupSCSI.xml
+++ b/docs/docs/stable/installer/sq/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="sq">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Setup SCSI</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
 SCSI controllers it may be unable to determine the correct drivers to use
 and subsequently fail to recognise the drive.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s)
-you have.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">DrakX should then be able to configure the drive(s) correctly.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/sq/software.xml b/docs/docs/stable/installer/sq/software.xml
new file mode 100644
index 00000000..aee78a0d
--- /dev/null
+++ b/docs/docs/stable/installer/sq/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="sq" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sq/soundConfig.xml b/docs/docs/stable/installer/sq/soundConfig.xml
index 499bba04..1fd4c438 100644
--- a/docs/docs/stable/installer/sq/soundConfig.xml
+++ b/docs/docs/stable/installer/sq/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="sq">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Konfigurimi zërit</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if one exists.</para>
+  
 
-  <para>The default driver should work without problems. However, if after install
-you do encounter problems, then run <command>draksound</command> or start
-this tool via MCC (Mageia Control Center), by choosing the
-<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound
-Configuration</guilabel> at the top right of the screen.</para>
+  
 
-  <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis
-role="bold">Sound Configuration</emphasis> tool screen, click on
-<guibutton>Troubleshooting</guibutton> to find useful advice about how to
-solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Avancuar</title>
     </info>
 
-    <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in
-this screen, during install, is useful if there is no default driver and
-there are several drivers available, but you think the installer selected
-the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on <emphasis
-role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sq/takeOverHdConfirm.xml b/docs/docs/stable/installer/sq/takeOverHdConfirm.xml
index 0d38ca84..be27217a 100644
--- a/docs/docs/stable/installer/sq/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/sq/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="sq">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Konfirmo diskun për tu formatuar</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is
-ok to erase every partition, every operating system and all data that might
-be on that hard disk.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/sq/testing.xml b/docs/docs/stable/installer/sq/testing.xml
index 739bb198..cfea297c 100644
--- a/docs/docs/stable/installer/sq/testing.xml
+++ b/docs/docs/stable/installer/sq/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testing Mageia as Live system</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Live mode</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>You get this screen if you selected "Boot Mageia". If not, you get the
-"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Testing hardware</title>
       </info>
 
-      <para>One of the Live mode goals is to test if the hardware is correctly managed
-by Mageia. You can check if all devices have a driver in the Hardware
-section of the Mageia Control Center. You can test the most current devices:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>graphical card: if you see the previous screen, it's already OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webcam:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>printer: configure it and print a test page</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
       </itemizedlist>
 
-      <para>If all is OK for you, you can process to the installation. If not, you can
-leave with the quit button.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>The configuration settings you made here are kept for the installation.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,15 +68,14 @@ leave with the quit button.</para>
         <title xml:id="testing3-ti1">Launch installation</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
-SSD drive, simply click on the icon "Install on Hard Disk". You will get
-this screen, and then the "<link
-linkend="doPartitionDisks">Partitioning</link> step" as for the direct
-installation.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/sq/uninstall-Mageia.xml b/docs/docs/stable/installer/sq/uninstall-Mageia.xml
index a7faceee..69d198a9 100644
--- a/docs/docs/stable/installer/sq/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/sq/uninstall-Mageia.xml
@@ -1,30 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="sq">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sq" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Ç'instalim Mageia </title>
   </info>
 
   
 
+  
+
   <para>If Mageia didn't convince you or you can't install it correctly - in short
 you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-  <para>After your data backup, reboot your Mageia installation DVD and select
-<emphasis role="bold">Rescue system</emphasis>, then, <emphasis
-role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
-will only have Windows, with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>In Windows to recover the space used by Mageia partitions: click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code>. You will recognize a Mageia partition
-because they are labeled <guilabel>Unknown</guilabel>, and also by their
-size and place on the disk. Right click on each of these partitions and
-select <guibutton>Delete</guibutton> to free up the space.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-  <para>Nëse jeni duke përdorur Windows XP, ju mund të krijoni një ndarje të re dhe
-ta formatoni atë (FAT32 apo NTFS). Ajo do të marrë një letër ndarje.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>If you have Vista or 7, you have one more possibility, you can extend the
 existing partition that is at the left of the freed space. There are other
@@ -32,4 +45,4 @@ partitioning tools that can be used, such as <emphasis
 role="bold">gparted</emphasis>, available for both Windows and Linux. As
 always, when changing partitions, be very careful to back up anything
 important to you.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sq/unused.xml b/docs/docs/stable/installer/sq/unused.xml
index afd540af..412a4440 100644
--- a/docs/docs/stable/installer/sq/unused.xml
+++ b/docs/docs/stable/installer/sq/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sq" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="sq">
   <info>
     <title xml:id="unused-ti1">Keep or delete unused material</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para>In this step, the installer looks for unused locales packages and unused
-hardware packages. Then it proposes you to delete them. It is a good idea to
-accept, except if you prepare an installation which has to run on different
-hardware.</para>
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
+
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>The next step is the copying of files on hard disk. This takes some
-minutes. At the end, you get a blank screen for some time, it's normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/sv/DrakLive-cover.xml b/docs/docs/stable/installer/sv/DrakLive-cover.xml
index 2281c3b1..2ec42677 100644
--- a/docs/docs/stable/installer/sv/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/sv/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="sv" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="sv" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Installation från ett LIVE-media</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Januari 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Installation från ett LIVE-media</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageias officiella dokumentation</para>
+      <para role="tagline">Mageias officiella dokumentation</para>
+
       <mediaobject>
-<imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Texter och skärmdumpar i denna manual finns under CC BY-SA 3.0 licensen
+<imageobject><imagedata fileref="../mageia-2013.png"/></imageobject></mediaobject>
+
+      <para>Texter och skärmdumpar i denna manual finns under CC BY-SA 3.0 licensen
 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-            </para>
-            <para>Denna manual är producerad med hjälp av <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Denna manual är producerad med hjälp av <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> utvecklad av <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>
-            </para>
-            <para>Den är skriven av frivilliga på deras fritid. Kontakta <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+      <para>Den är skriven av frivilliga på deras fritid. Kontakta <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentations-teamet</link>
-om du vill hjälpa till och förbättra den här manualen.</para> 
+om du vill hjälpa till och förbättra den här manualen.</para>
     </cover>
   </info>
+
   <article>
     <title>Installation från ett LIVE-media</title>
-       <para><note>
-          <para>Ingen kommer att se alla installerarens skärmbilder som du ser i den här
+
+    <para><note>
+        <para>Ingen kommer att se alla installerarens skärmbilder som du ser i den här
 handboken. Vilka skärmbilder som just du kommer att se beror på din hårdvara
 och vilka val du gör under installationen.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/sv/DrakLive.xml b/docs/docs/stable/installer/sv/DrakLive.xml
index 60a25288..9ee60e8e 100644
--- a/docs/docs/stable/installer/sv/DrakLive.xml
+++ b/docs/docs/stable/installer/sv/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="sv" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="sv" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Installation från ett LIVE-media</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Installation från ett LIVE-media</title>
 
     <cover>
       <para><note>
@@ -17,9 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 ns6:href="http://www.calenco.com">Calenco CMS</link> utvecklad av <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
 
-      <para>Den är skriven av frivilliga på deras fritid. Kontakta <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentations-teamet</link>
-om du vill hjälpa till och förbättra den här manualen.</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>
 
@@ -39,7 +54,12 @@ om du vill hjälpa till och förbättra den här manualen.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +69,18 @@ om du vill hjälpa till och förbättra den här manualen.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/sv/DrakX-cover.xml b/docs/docs/stable/installer/sv/DrakX-cover.xml
index 340ce2ec..20a89998 100644
--- a/docs/docs/stable/installer/sv/DrakX-cover.xml
+++ b/docs/docs/stable/installer/sv/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="sv" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="sv" xml:id="Quick-Startup"
+      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 med DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>februari 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>februari 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageias officiella dokumentation</para>
+      <para role="tagline">Mageias officiella dokumentation</para>
+
       <mediaobject>
 <imageobject><imagedata fileref="../mageia-2013.png"/></imageobject></mediaobject>
-	    <para>Texter och skärmdumpar i denna manual finns under CC BY-SA 3.0 licensen
+
+      <para>Texter och skärmdumpar i denna manual finns under CC BY-SA 3.0 licensen
 <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
-	    </para>
-	    <para>Denna manual är producerad med hjälp av <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Denna manual är producerad med hjälp av <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> utvecklad av <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>
-	    </para>
-            <para>Den är skriven av frivilliga på deras fritid. Kontakta <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+      <para>Den är skriven av frivilliga på deras fritid. Kontakta <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentations-teamet</link>
-om du vill hjälpa till och förbättra den här manualen.</para> 
+om du vill hjälpa till och förbättra den här manualen.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Installation med DrakX</title>
-       <para><note>
-          <para>Ingen kommer att se alla installerarens skärmbilder som du ser i den här
+
+    <para><note>
+        <para>Ingen kommer att se alla installerarens skärmbilder som du ser i den här
 handboken. Vilka skärmbilder som just du kommer att se beror på din hårdvara
 och vilka val du gör under installationen.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ och vilka val du gör under installationen.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/sv/DrakX-inline.xml b/docs/docs/stable/installer/sv/DrakX-inline.xml
new file mode 100644
index 00000000..68058103
--- /dev/null
+++ b/docs/docs/stable/installer/sv/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="sv" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Installation med DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>Ingen kommer att se alla installerarens skärmbilder som du ser i den här
+handboken. Vilka skärmbilder som just du kommer att se beror på din hårdvara
+och vilka val du gör under installationen.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Texter och skärmdumpar i denna manual finns under CC BY-SA 3.0 licensen
+<link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
+
+      <para>Denna manual är producerad med hjälp av <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> utvecklad av <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+
+      <para>Den är skriven av frivilliga på deras fritid. Kontakta <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Dokumentations-teamet</link>
+om du vill hjälpa till och förbättra den här manualen.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/DrakX.xml b/docs/docs/stable/installer/sv/DrakX.xml
index 83cc5438..5d9ab351 100644
--- a/docs/docs/stable/installer/sv/DrakX.xml
+++ b/docs/docs/stable/installer/sv/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="sv" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="sv" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Installation med DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Installation med DrakX</title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ om du vill hjälpa till och förbättra den här manualen.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ om du vill hjälpa till och förbättra den här manualen.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ om du vill hjälpa till och förbättra den här manualen.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ om du vill hjälpa till och förbättra den här manualen.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ om du vill hjälpa till och förbättra den här manualen.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ om du vill hjälpa till och förbättra den här manualen.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/sv/SelectAndUseISOs2.xml b/docs/docs/stable/installer/sv/SelectAndUseISOs2.xml
index b5baee06..ea016c4e 100644
--- a/docs/docs/stable/installer/sv/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/sv/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="sv" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Välj och använd ISO-filer</title>
   </info>
   <section>
     <title>Presentation</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
-    <para>There are two families of media:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: Booting with this media provides you with the maximum
-flexibility when choosing what to install, and for configuring your
-system. In particular, you have a choice of which Desktop environment to
-install</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: This option allows you to try out Mageia without having to
-actually install it, or make any changes to your computer.  If the
-installation is decided, the process is simpler, but you get fewer choices
-than offered by the Classical installer</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Detaljer följer i nästkommande avsnitt.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Media</title>
     <section>
       <title>Definition</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support (DVD, USB
-stick, ...) the ISO file is copied to.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>Du kan hitta ISO-filer för Mageia <link
 ns4:href="http://www.mageia.org/en/downloads/">här</link>.</para>
     </section>
@@ -43,25 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">här</link>.</para>
         <title>Vanliga funktioner</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the Classical installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
             <para>They are used for performing clean installs or to upgrade a previously
-installed version of Mageia.</para>
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Vissa verktyg är tillgängliga från välkomstskärmen: Räddningssystem,
-minnestest och identifiering av hårdvara.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Varje DVD innehåller många skrivbordsmiljöer och språk.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Du kommer under installationen att få välja att lägga till icke-fri
-programvara.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -73,21 +107,19 @@ programvara.</para>
         <itemizedlist>
           <listitem>
             <para>Can be used to preview the Mageia operating system without having to install
-it. Can also be used to install Mageia if you wish.</para>
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade previously installed Mageia
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>De innehåller icke-fri mjukvara.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -95,13 +127,13 @@ releases.</emphasis></para>
         <title>Live DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Endast skrivbordsmiljön Plasma.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Alla tillgängliga språk är närvarande.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Endast 64-bitars plattform.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -109,13 +141,13 @@ releases.</emphasis></para>
         <title>Live DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>Endast skrivbordsmiljön GNOME.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Alla tillgängliga språk är närvarande.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Endast 64-bitars plattform.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -123,13 +155,13 @@ releases.</emphasis></para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Endast skrivbordsmiljön Xfce.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>Alla tillgängliga språk är närvarande.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 eller 64-bitars plattform.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -140,22 +172,10 @@ releases.</emphasis></para>
         <title>Vanliga funktioner</title>
         <itemizedlist>
           <listitem>
-            <para>These are minimal ISO's containing no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient if
-bandwidth is too low to download a full DVD, or if you have a PC without a
-DVD drive or is unable to boot from a USB stick.</para>
-          </listitem>
-          <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>First steps are English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -163,8 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Innehåller endast fri mjukvara, för de som föredrar att inte använda
-mjukvara som inte är gratis.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -172,8 +192,7 @@ mjukvara som inte är gratis.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Innehåller icke-fri mjukvara (för det mesta drivrutiner och codecs) för de
-som behöver det.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -185,16 +204,23 @@ som behöver det.</para>
       <title>Hämtar</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, you are provided with some information, such as
-the mirror in use and an option to switch if the bandwidth is too low. If
-http is chosen, you will also see something regarding checksums.</para>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the
-other, and copy the checksum <link linkend="integrity">for later
-use</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Kontrollerar integriteten på nerladdad media</title>
@@ -202,52 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
 algorithm from the file to be downloaded. You may compare the checksum of
 your downloaded ISO against that of the original source ISO. If the
 checksums do not match, it means that the actual data on the ISO's do not
-match, and if it is the case, then you should retry the download or attempt
-a repair using BitTorrent.</para>
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>To generate the checksum for your downloaded ISO, open a console, (no need
 to be root), and:</para>
       <itemizedlist>
         <listitem>
-          <para>To use md5sum, type: <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>To use sha1sum, type: <userinput>sha1sum
-path/to/the/image/file.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Exempel:</para>
+      <para>Exempel:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Bränn eller dumpa ISO-filen.</title>
-    <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
-stick. This is not a standard copy operation as a bootable medium will
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
 actually be created.</para>
     <section>
       <title>Att bränna ISO-filen till en CD/DVD</title>
-      <para>Whichever software you use, ensure that the option to burn an <emphasis
-role="bold">image</emphasis> is used, burn <emphasis
-role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not
-correct. See <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link> for more information.</para>
     </section>
     <section>
       <title>Dumpa ISOn till ett USB-minne</title>
-      <para>Alla Mageias ISO-filer är hybrider, dvs. du kan "dumpa" dem på ett USB-minne
-och sedan använda det för att starta och installera systemet.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any existing data will be lost and the partition capacity will
-be reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>För att återfå den ursprungliga kapaciteten måste du partitionera och
-formatera om USB-enheten.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Använda ett grafiskt verktyg i Mageia</title>
         <para>Du kan använda ett grafiskt verktyg som t. ex. <link
@@ -259,7 +296,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <itemizedlist>
           <listitem>
             <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link
@@ -268,7 +305,7 @@ ns4:href="http://sourceforge.net/projects/win32diskimager">Win32-diskavbildaren<
         </itemizedlist>
       </section>
       <section>
-        <title>Använda kommandoraden i ett GNU/Linux-system</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk overwriting
 potentially valuable existing data if you specify the wrong target device.</para>
@@ -278,27 +315,27 @@ potentially valuable existing data if you specify the wrong target device.</para
             <para>Öppna en konsol</para>
           </listitem>
           <listitem>
-            <para>Become a root (Administrator) user with the command <userinput>su
--</userinput> (don't forget the final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Anslut ditt USB-minne (montera inte det, dvs. öppna inget program eller
-filhanterare som kan läsa det)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Skriv kommandot <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
             <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
             <para>Alternatively, you can find the device name with the command
-<code>dmesg</code>: towards the end of this example, you can see the device
-name starting with <emphasis>sd</emphasis>, and in this case,
-<emphasis>sdd</emphasis> is the actual device. You can also see that its
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
 size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
@@ -320,21 +357,22 @@ size is 2GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: <emphasis role="bold"># <userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Where X=your device name eg: /dev/sdd</para>
-            <para>Example:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-and <emphasis role="bold">of</emphasis> stands for <emphasis
-role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Skriv kommandot: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>This is the end of the process, and you may now unplug your USB stick.</para>
@@ -343,4 +381,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/acceptLicense.xml b/docs/docs/stable/installer/sv/acceptLicense.xml
index 6a5cf64b..d646ebc2 100644
--- a/docs/docs/stable/installer/sv/acceptLicense.xml
+++ b/docs/docs/stable/installer/sv/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Anteckningar för licens och utgåvan</title>
   </info>
 
@@ -46,19 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">Licensavtal</title>
     </info>
 
-    <para>Var god läs licensvillkoren noggrant innan du installerar
-<application>Mageia</application>.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>De här villkoren gäller för hela
-<application>Mageia</application>-distributionen och måste accepteras innan
-du kan fortsätta.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>To proceed, simply select <guilabel>Accept</guilabel> and then click on
-<guibutton>Next</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Om du väljer att inte acceptera dessa villkor, så tackar vi dig för att du
-tittade. Genom att klicka på <guibutton>Avsluta</guibutton> så kommer din
-dator att startas om.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -76,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Important information about this release of
-<application>Mageia</application> can be viewed by clicking on the
-<guibutton>Release Notes</guibutton> button.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/addUser.xml b/docs/docs/stable/installer/sv/addUser.xml
index 122a0a25..f771e884 100644
--- a/docs/docs/stable/installer/sv/addUser.xml
+++ b/docs/docs/stable/installer/sv/addUser.xml
@@ -1,32 +1,51 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sv" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Hantering av användare och administratör</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Ställ in ett administratörs  (root) -lösenord:</title>
     </info>
 
-    <para>It is advisable for all <application>Mageia</application> installations to
-set a <emphasis role="bold">superuser</emphasis> (administrator) password,
-usually called the <emphasis>root password</emphasis> in Linux. As you type
-a password into the top box a shield will change from red to yellow to green
-depending on the strength of the password. A green shield shows you are
-using a strong password. You need to repeat the same password in the box
-underneath, to check that the first entry was not mistyped.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>All passwords are case sensitive. It is best to use a mixture of letters
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
 (upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
@@ -36,43 +55,46 @@ underneath, to check that the first entry was not mistyped.</para>
       <title xml:id="enterUser-ti3">Lägg till en användare</title>
     </info>
 
-    <para>Add a user here. A regular user has fewer privileges than the <emphasis
-role="bold">superuser</emphasis> (root), but enough to use the internet,
-office applications or play games and anything else the average user might
-use their computer for.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Ikon</guibutton>: om du klickar på den här knappen så kommer
-användarens ikon att ändras.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Verkligt namn</guilabel>: Skriv in användarens verkliga namn i det
-här fältet.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use
-a version of the user's real name. <emphasis role="bold">The login name is
-case sensitive.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password</guilabel>: Type in the user password. There is a shield
-at the end of the text box that indicates the strength of the password. (See
-also <xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password (again)</guilabel>: Retype the user password DrakX will
-check that you have not mistyped the password.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Any users you added while installing Mageia, will have a home directory that
-is both read and write protected (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
@@ -82,32 +104,31 @@ management</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Avancerad hantering av användare</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>The <guibutton>Advanced</guibutton> option allows you to edit further
-settings for the user you are adding.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
-<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis>
-and <emphasis role="bold">Sh</emphasis></para>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the <emphasis
-role="bold">user ID</emphasis> for any user you added in the previous
-screen. If you are unsure what the purpose of this is, then leave it blank.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sv/add_supplemental_media.xml b/docs/docs/stable/installer/sv/add_supplemental_media.xml
index acbb8ca6..87732c82 100644
--- a/docs/docs/stable/installer/sv/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/sv/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="sv">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Val av media (konfigurera kompletterande installationsmedier)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,43 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>This screen shows you the list of already recognized repositories. You can
-add other sources for packages, like an optical disc or a remote source.
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
 The source selection determines which packages will be available during the
-next steps.</para>
+subsequent steps.</para>
 
   <para>För en nätverkskälla så finns det två steg att följa:</para>
 
   <orderedlist>
     <listitem>
-      <para>Val och aktivering av nätverket om det inte redan är uppe.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
       <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
 mirror, you have access to the selection of all repositories managed by
-Mageia, like the <emphasis role="bold">Nonfree</emphasis>, the <emphasis
-role="bold">Tainted</emphasis> repositories and the <emphasis
-role="bold">Updates</emphasis>. With the URL, you can designate a specific
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
 repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>If you are updating a 64 bit installation which may contain some 32 bit
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
 packages, it is advised to use this screen to add an online mirror by
-ticking one of the Network protocols here. The 64-bit DVD ISO only contains
-64-bit and noarch packages, it will not be able to update the 32-bit
-packages. However, after adding an online mirror, the installer will find
-the needed 32-bit packages there.</para>
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/ask_mntpoint_s.xml b/docs/docs/stable/installer/sv/ask_mntpoint_s.xml
index e66a1897..d87057bc 100644
--- a/docs/docs/stable/installer/sv/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/sv/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="sv">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Välj monteringspunkter</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Här ser du de Linux-partitioner som har hittats i din dator. Om du inte är
-nöjd med vad <application>DrakX</application> föreslår så kan du ändra
-monteringspunkterna.</para>
-
-  <note>
-    <para>If you change anything, make sure you still have a <emphasis
-role="bold"><literal>/</literal></emphasis> (root) partition.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis
-role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
-name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis>
-(for example, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>If you have several partitions, you can choose various different mount
-points from the drop down menu, such as <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis
-role="bold">/var</emphasis>. You can even make your own mount points, for
-instance <emphasis role="bold"><literal>/video</literal></emphasis> for a
-partition where you want to store your films, or <emphasis
-role="bold">/Data</emphasis> (or some other name) for your data.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -79,13 +82,17 @@ mount point field blank.</para>
   </itemizedlist>
 
   <warning>
-    <para>If you are not sure what to choose, click <emphasis
-role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
-disk partitioning</guilabel>, where, you can click on a partition to see its
-type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Om du är säker på att monteringspunkterna är korrekta så klickar du på
-<guibutton>Nästa</guibutton> där du väljer om du vill formatera
-partitonenerna som DrakX föreslår eller mer.</para>
-</section>
\ No newline at end of file
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/sv/bestTime.xml b/docs/docs/stable/installer/sv/bestTime.xml
index 7a0e04f1..ebb5aacf 100644
--- a/docs/docs/stable/installer/sv/bestTime.xml
+++ b/docs/docs/stable/installer/sv/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sv" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="sv" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Inställningar för klocka</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>I det här steget måste du ställa in den tidszon som den interna klockan är
-inställd på, antingen lokal tid eller UTC.</para>
-
-  <para>På fliken avancerat hittar du fler inställningar för klockan.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/bootLive.xml b/docs/docs/stable/installer/sv/bootLive.xml
index 12cbea1a..932c4d98 100644
--- a/docs/docs/stable/installer/sv/bootLive.xml
+++ b/docs/docs/stable/installer/sv/bootLive.xml
@@ -1,28 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="sv"><info><title xml:id="bootLive-ti1">Starta Mageia som ett Live-system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Startar upp mediat</title></info><section><info><title xml:id="bootLive11-ti1">Från en skiva</title></info><para>Du kan starta direkt från de media du använde för att bränna din avbildning
-(CD-ROM, DVD-ROM...). Vanligtvis räcker det med att du sätter i skivan i din
-CD/DVD för att starthanteraren automatiskt ska starta
-installationsprogrammet efter omstart. Om det inte fungerar måste du ändra
-inställningarna i ditt BIOS eller trycka på den tangent som gör att du kan
-välja startmedia.</para><para>Beroende på vilken hårdvara du har och hur den är konfigurerad kan du få en
-av följande två skärmar nedan.</para></section><section><info><title xml:id="bootLive12-ti1">Från en USB-enhet</title></info><para>Du kan starta från din USB-enhet där du dumpat din ISO-avbildning. Beroende
-på hur ditt BIOS är inställt kan datorn starta direkt från USB-enheten om
-den redan är inkopplad i en USB-port. Om den inte gör det måste du
-eventuellt ändra i dina BIOS-inställningar, eller trycka på den tangent som
-gör att du kan välja startmedia.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">I BIOS/CSM/Legacy-läge</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>Den första skärmen när du startar i BIOS-läge</para></caption></mediaobject><para>I den mittersta menyn så kan du välja mellan tre handlingar:</para><itemizedlist><listitem><para>Starta Mageia: Detta gör att Mageia 5 kommer att starta från det media som
-är anslutet (CD/DVD eller USB) utan att skriva något till hårddisken, så var
-beredd på ett väldigt långsamt system. När uppstarten är klar kan du
-fortsätta och installera på hårddisken.</para></listitem><listitem><para>Installera Mageia: Det här valet kommer att installera Mageia direkt på en
-hårddisk.</para></listitem><listitem><para>Uppstart från hårddisk: Det här valet tillåter dig att starta upp som
-vanligt från en hårddisk när inget media (CD/DVD eller USB-minne) är
-anslutet. (fungerar inte med Mageia 5).</para></listitem></itemizedlist><para>I menyn längst ner finns startalternativen:</para><itemizedlist><listitem><para>F1 - Hjälp. Förklara valen "splash", "apm", "acpi" och "idle"</para></listitem><listitem><para>F2 - Språk. Välj skärmens visningsspråk.</para></listitem><listitem><para>F3 - Skärmupplösning. Välj mellan text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom eller annat. Normalt sätt genomförs installationen från
-det media som är anslutet. Du kan även välja andra källor så som en FTP
-eller NFS-server. Om installationen genomförs över nätverk med en SLP-server
-så kan du välja installationskällor på servern med det här alternativet.</para></listitem><listitem><para>F5 - Drivrutin. Ja eller Nej. Systemet är medvetet om närvaron av en
-alternativ disk med en drivrutinsuppdatering och kommer att kräva att den
-sätts in under installationsprocessen.</para></listitem><listitem><para>F6 - Kernel-alternativ: Här kan du specificera alternativ beroende på din
-hårdvara och vilka drivrutiner som ska användas.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">I UEFI-läge</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>Första skärmen när du startar ett UEFI-system från disk</para></caption></mediaobject><para>Du kan enbart köra Mageia i liveläge. (första alternativet) eller att
-bearbeta installationen (andra alternativet).</para><para>Om du har startat från en USB-enhet har du två extra rader som är identiska
-men har "USB" på slutet. Du måste välja dem.</para><para>I alla fall så kommer de första stegen att vara samma för att välja språk,
-tidszon och tangentbord. Sedan skiljer sig stegen med  <link
-linkend="testing">extra steg för liveläge</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Starta Mageia som ett Live-system</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Startar upp mediat</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">I BIOS/CSM/Legacy-läge</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Den första skärmen när du startar i BIOS-läge</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">I UEFI-läge</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/sv/chooseDesktop.xml b/docs/docs/stable/installer/sv/chooseDesktop.xml
index 9a0e94de..667ca791 100644
--- a/docs/docs/stable/installer/sv/chooseDesktop.xml
+++ b/docs/docs/stable/installer/sv/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sv" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Val av skrivbordsmiljö</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Val av skrivbordsmiljö</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide-show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> or <application>GNOME</application>
-desktop environment. Both come with a full set of useful applications and
-tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
-use both), or if you want to modify the default software choices for these
-desktop environments. The <application>LXDE</application> desktop, for
-instance, is lighter than the previous two, sporting less eye candy and
-fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/sv/choosePackageGroups.xml b/docs/docs/stable/installer/sv/choosePackageGroups.xml
index 2d4e8a7f..a66bddf3 100644
--- a/docs/docs/stable/installer/sv/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/sv/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sv" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sv" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Val av paketgrupp</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/sv/choosePackagesTree.xml b/docs/docs/stable/installer/sv/choosePackagesTree.xml
index cbbf3a88..d29051ac 100644
--- a/docs/docs/stable/installer/sv/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/sv/choosePackagesTree.xml
@@ -1,21 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="sv">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="sv">
   <info>
     <title xml:id="choosePackagesTree-ti1">Välj individuella paket</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject><imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/></imageobject></mediaobject>
 
   <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-  <para>Efter att du har gjort dina val så kan du klicka på
-<guibutton>diskett-ikonen</guibutton> längst ner på sidan för att spara dina
-paketval (att spara till ett USB-minne fungerar också). Du kan sedan använda
-denna fil för att installera samma paket på ett annat system genom att
-trycka på samma knapp under installationen och välja att ladda den.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/configureServices.xml b/docs/docs/stable/installer/sv/configureServices.xml
index 6e050c97..15225cd7 100644
--- a/docs/docs/stable/installer/sv/configureServices.xml
+++ b/docs/docs/stable/installer/sv/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sv" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="sv" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Konfigurera dina tjänster</title>
   </info>
@@ -7,19 +7,30 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject><imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/></imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose are usually good.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">Om du markerar en tjänst så visas viss information i inforutan nedan.</para>
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Om du markerar en tjänst så visas viss information i inforutan nedan.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Ändra bara på saker när du vet mycket väl vad du gör.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/configureTimezoneUTC.xml b/docs/docs/stable/installer/sv/configureTimezoneUTC.xml
index 0af4c36a..f5ffb3b1 100644
--- a/docs/docs/stable/installer/sv/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/sv/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="sv">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="sv">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Ställ in din tidszon</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the
-same time-zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
 or to GMT, also known as UTC.</para>
diff --git a/docs/docs/stable/installer/sv/configureX_card_list.xml b/docs/docs/stable/installer/sv/configureX_card_list.xml
index 30bd3e06..1abda085 100644
--- a/docs/docs/stable/installer/sv/configureX_card_list.xml
+++ b/docs/docs/stable/installer/sv/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="sv">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Välj en X-server (konfigurera ditt grafikkort)</title>
   </info>
 
   <mediaobject>
-<imageobject><imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png"
-revision="1"/></imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX har en väldigt omfattande databas av grafikkort och identifierar
 oftast ditt nuvarande grafikkort korrekt.</para>
@@ -29,33 +42,34 @@ oftast ditt nuvarande grafikkort korrekt.</para>
   <para>Om installationen inte har upptäckt ditt grafikkort korrekt och du vet
 vilket du har så kan du välja det från trädet genom: <itemizedlist>
       <listitem>
-        <para>tillverkare</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>sedan namnet på ditt kort</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>och typ av kort</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-<emphasis role="bold">Xorg</emphasis> category, which provides more than 40
-generic and open source video card drivers. If you still can't find a
-specific driver for your card there is the option of using the <emphasis
-role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the <emphasis role="bold">Command-line</emphasis> Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the <emphasis role="bold">Nonfree</emphasis>
-repository and in some cases only from the card manufacturers' websites.</para>
-
-  <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be
-explicitly enabled to access them. If you didn't enable it previously, you
-should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/sv/configureX_chooser.xml b/docs/docs/stable/installer/sv/configureX_chooser.xml
index feee6e79..54dcb76e 100644
--- a/docs/docs/stable/installer/sv/configureX_chooser.xml
+++ b/docs/docs/stable/installer/sv/configureX_chooser.xml
@@ -1,62 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="sv">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Konfigurera grafikkort och bildskärm</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject><imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center"
-revision="1"/></imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym> or any other graphical environment to work well, the
-following <acronym>X</acronym> settings need to be correct. Choose the
-correct settings if none are shown, or if you think the details are
-incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Grafikkort</guibutton></emphasis>: Välj ditt kort från
-listan om det behövs.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from
-the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose
-<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and
-vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Inkorrekta uppdateringsfrekvenser kan skada din skärm</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and
-color depth of your monitor can be set here.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the option is there, and you test your
-settings, you should be ask whether your settings are correct. If you answer
-<emphasis role="bold">yes</emphasis>, the settings will be kept. If you
-don't see anything, you'll return to the configuration screen and be able to
-reconfigure everything until the test result is satisfactory. If the test
-option is not available, then make sure your settings are on the safe side.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Alternativ</guibutton></emphasis>: Här kan du välja att
-aktivera eller inaktivera olika alternativ.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/sv/configureX_monitor.xml b/docs/docs/stable/installer/sv/configureX_monitor.xml
index e15bc93c..5dab7af7 100644
--- a/docs/docs/stable/installer/sv/configureX_monitor.xml
+++ b/docs/docs/stable/installer/sv/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="sv">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,65 +23,82 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Att välja din bildskärm</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX har en väldigt omfattande databas av grafikkort och kommer oftast att
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX har en väldigt omfattande databas av grafikkort och kommer oftast att
 identifiera ditt nuvarande grafikkort rätt.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
 could damage your monitor or video hardware. Please don't try something
 without knowing what you are doing.</emphasis> If in doubt you should
 consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
-<imageobject><imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center"
-revision="1"/></imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Anpassad</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Med det här alternativet kan du ställa in två kritiska parametrar, den
-vertikala uppdateringsfrekvensen och den horisontella synkhastigheten. Den
-vertikala uppdateringsfrekvensen bestämmer hur ofta skärmen ska uppdateras
-och den horisontella synkhastigheten är den hastighet med vilken sveplinjer
-visas.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">Det är <emphasis>VÄLDIGT VIKTIGT</emphasis> att du inte anger en skärmtyp
+        <para revision="1" xml:id="configureX_monitor-pa4">Det är <emphasis>VÄLDIGT VIKTIGT</emphasis> att du inte anger en skärmtyp
 med ett synkroniseringsintervall som är över kapaciteten för din bildskärm,
 då kan du skada den. Om du är osäker så välj en försiktig inställning och
 läs dokumentationen för din bildskärm.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">Det här är standardalternativet som försöker avgöra skrämtyp från databasen
-över bildskärmar.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Tillverkare</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">Om installationen inte har upptäckt din bildskärm och du vet vilken du har
-så kan du välja den från trädet genom att välja: <itemizedlist>
       <listitem>
-        <para>tillverkare</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>Bildskärmstillverkarens namn</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>bildskärmens beskrivning</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Om installationen inte har upptäckt din bildskärm och du vet vilken du har
+så kan du välja den från trädet genom att välja:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Standard</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the <emphasis
-role="bold">Vesa</emphasis> card driver when your video hardware cannot be
-determined automatically. Once again it may be wise to be conservative in
-your selections.</para>
-</section>
\ No newline at end of file
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/sv/diskPartitioning.xml b/docs/docs/stable/installer/sv/diskPartitioning.xml
new file mode 100644
index 00000000..c928ee14
--- /dev/null
+++ b/docs/docs/stable/installer/sv/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="sv" version="5.0" xml:lang="sv">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/diskdrake.xml b/docs/docs/stable/installer/sv/diskdrake.xml
index 8569f96c..2cd5892a 100644
--- a/docs/docs/stable/installer/sv/diskdrake.xml
+++ b/docs/docs/stable/installer/sv/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sv" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Anpassad diskpartionering med DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis>
-partition you must ensure that you have a separate <emphasis
-role="bold">/boot</emphasis> partition. The encryption option for the
-<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise
-your system will be unbootable.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view their details before you start.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage
-device like a USB key). In the screen-shot above there are two available
-devices: <emphasis role="bold">sda </emphasis>and <emphasis
-role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if
-you are sure you want to wipe all partitions on the selected storage device.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Expert mode</guibutton> provides more options such as a label
-(give a name to) a partition, or to choose a partition type.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Klicka på <guibutton>Klar</guibutton> när du är redo.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
-Partition) is present and correctly mounted on /boot/EFI (see below)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>Kontrollera att det finns en BIOS startpartition om du installerar Mageia på
-ett Legacy/GPT-system</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/sv/doPartitionDisks.xml b/docs/docs/stable/installer/sv/doPartitionDisks.xml
index 473dd158..95e7e9e7 100644
--- a/docs/docs/stable/installer/sv/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/sv/doPartitionDisks.xml
@@ -1,173 +1,214 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sv" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Partitionering</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the
-DrakX partitioning proposals for where to install
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the
-layout and content of your particular hard drive(s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Använd existerande partitioner</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">Om det här alternativet är tillgängligt så har kompatibla Linux-partitioner
+      <para revision="1" xml:id="doPartitionDisks-pa5">Om det här alternativet är tillgängligt så har kompatibla Linux-partitioner
 hittats och kan användas för installation.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Använd ledigt utrymme</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">Om du har ledigt utrymme på din hårddisk kommer det här alternativet att
+      <para revision="1" xml:id="doPartitionDisks-pa7">Om du har ledigt utrymme på din hårddisk kommer det här alternativet att
 använda det för att installera Mageia.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Använd ledigt utrymme på en Windows-partition</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">Om du har ledigt utrymme på din befintliga Windows-partition så kan DrakX ge
-dig möjlighet att använda det.</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">Det kan vara ett användbart för att göra plats för din nya
-Mageia-installation, men är en riskfylld operation. Därför bör du se till
-att du har säkerhetskopierat alla viktiga filer!</para>
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Observera att det innebär att storleken på Windows-partitionen
 krymps. Partitionen måste vara "ren", dvs. att Windows måste ha stängts av
 korrekt när det användes sist. Den måste också ha defragmenterats, även om
 det inte är någon garanti för att filerna har flyttats bort ifrån ytan som
 kommer att användas. Du rekommenderas starkt att säkerhetskopiera dina
 personliga filer.</para>
+      </important>
+    </listitem>
 
-        <para>With this option, the installer displays the remaining Windows partition in
-light blue and the proposed Mageia partition in dark blue with their
-intended sizes just underneath. You have the option to modify these sizes by
-clicking and dragging the gap between both partitions. See the following
-screen-shot.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Radera och använd hela hårddisken.</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">Det här alternativet kommer att allokera hela disken till Mageia.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Tänk på att detta kommer att ta radera ALL data på den valda hårddisken. Var
-försiktig!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">Detta ger dig fullständig kontroll över placeringen av installationen på
+din/a disk/ar.</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">Om du har för avsikt att använda en del av hårddisken för någonting annat
-eller om du redan har data på disken som du inte är beredd att förlora så
-ska du inte använda detta alternativ.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Anpassad diskpartitionering</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">Detta ger dig fullständig kontroll över placeringen av installationen på
-din/a disk/ar.</para>
-      </listitem>
-    </itemizedlist></para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Hantera partitionsstorlek:</emphasis></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para>If you are not using the <emphasis role="bold">Custom disk
-partitioning</emphasis> option, the installer will allocate the available
-space according to the following rules:</para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>If the total available space is less than 50 GB, then only one partition is
-created. This will be the <emphasis role="bold">/</emphasis> (root)
-partition.</para>
-      </listitem>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-      <listitem>
-        <para>If the total available space is greater than 50 GB, then three partitions
-are created</para>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 of the total available place is allocated to <emphasis
-role="bold">/</emphasis> with a maximum of 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 är allokerat till swap med en gräns på 4 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>the rest (at least 12/19) is allocated to <emphasis
-role="bold">/home.</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-  <para>That means that from 160 GB or greater available space, the installer will
-create three partitions: 50 GB for <emphasis role="bold">/</emphasis>, 4 GB
-for <emphasis role="bold">swap</emphasis> and the remainder for <emphasis
-role="bold">/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
-automatically detected - or created if it does not exist yet, and mounted on
-/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to
-create a BIOS boot partition if not already existing. It is a roughly 1 MiB
-partition with no mount point. Choose <xref linkend="diskdrake"/> to be able
-to create it with the Installer like any other partition, just select BIOS
-boot partition as the filesystem type.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512. Due to lack of available hardware, the
 partitioning tool used in the installer has not been tested with such a
-drive. Also some SSD devices now use an erase block size over 1 MB. If you
-have such a device we suggest that you partition the drive in advance, using
-an alternative partitioning tool like <emphasis
-role="bold">gparted</emphasis>, and to use the following settings:</para>
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Justera till</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/sv/exitInstall.xml b/docs/docs/stable/installer/sv/exitInstall.xml
index 16f96ace..4be44fd5 100644
--- a/docs/docs/stable/installer/sv/exitInstall.xml
+++ b/docs/docs/stable/installer/sv/exitInstall.xml
@@ -5,23 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">Du är nu klar med installationen och konfigureringen av
-<application>Mageia</application> och du kan nu säkert ta bort
-installationsmediet och starta om din dator.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems (if there are more than one) on your computer.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">Om du inte ändrade inställningarna för starthanteraren så kommer Mageia att
 väljas och starta automatiskt.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Njut!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Besök www.mageia.org om du har några frågor eller om du vill bidra till
-Mageia</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/firewall.xml b/docs/docs/stable/installer/sv/firewall.xml
index 63016545..463f2de5 100644
--- a/docs/docs/stable/installer/sv/firewall.xml
+++ b/docs/docs/stable/installer/sv/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="sv">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="sv" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Brandvägg</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Brandvägg</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
   <para>In the default setting (no button is checked), no service of the system is
-accessible from the network. The <emphasis role="bold">Everything (no
-firewall)</emphasis> enables access to all services of the machine - an
-option that does not make much sense in the context of the installer since
-it would create a totally unprotected system. Its veritable use is in the
-context of the Mageia Control Center (which uses the same GUI layout) for
-temporarily disabling the entire set of firewall rules for testing and
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
 debugging purposes.</para>
 
   <para>All other options are more or less self-explanatory. As an example, you will
-enable the <emphasis role="bold">CUPS server</emphasis> if you want printers
-on your machine to be accessible from the network.</para>
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Avancerat</emphasis></para>
 
-  <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where
-you can enable a series of services by typing a list of couples (blank
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
   <para><emphasis>&lt;portnummer>/&lt;protokoll></emphasis></para>
diff --git a/docs/docs/stable/installer/sv/formatPartitions.xml b/docs/docs/stable/installer/sv/formatPartitions.xml
index 19a25021..addff7f9 100644
--- a/docs/docs/stable/installer/sv/formatPartitions.xml
+++ b/docs/docs/stable/installer/sv/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="sv">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formatering</title>
   </info>
@@ -11,34 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"><imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/></imageobject><imageobject
-condition="live"><imagedata format="PNG" xml:id="live-formatPartitions-im1"
-align="center" fileref="live-formatPartitions.png"
-revision="1"/></imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
 partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Vanligtvis behöver i alla fall de partitioner som DrakX har valt att
-formateras.</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Klicka på <guibutton>Avancerat</guibutton> för att välja vilka partitioner
-som du vill kontrollera efter så kallade <emphasis>dåliga block</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen,
-where you can choose to view details of your partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">När du är säker på ditt val, klicka på <guibutton>Nästa</guibutton> för att
-fortsätta.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/sv/graphicalConfiguration.xml b/docs/docs/stable/installer/sv/graphicalConfiguration.xml
new file mode 100644
index 00000000..61bb2e56
--- /dev/null
+++ b/docs/docs/stable/installer/sv/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/sv/installUpdates.xml b/docs/docs/stable/installer/sv/installUpdates.xml
index 8c6d0138..ae399834 100644
--- a/docs/docs/stable/installer/sv/installUpdates.xml
+++ b/docs/docs/stable/installer/sv/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="sv">
-  <info>
-    <title xml:id="installUpdates-ti1">Uppdateringar</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Uppdateringar</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Efter att den här versionen av <application>Mageia</application> släpptes så
-kommer några paket ha blivit uppdaterade eller förbättrade.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them,
-select <guilabel>No</guilabel> if you don't want to do this now, or if you
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
 aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Tryck på <guibutton>Nästa</guibutton> för att fortsätta</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/installer.xml b/docs/docs/stable/installer/sv/installer.xml
index 05de0a5e..3c7cb466 100644
--- a/docs/docs/stable/installer/sv/installer.xml
+++ b/docs/docs/stable/installer/sv/installer.xml
@@ -6,164 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, Mageias installerare</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, Mageias installerare</title>
   </info>
 
   <para>Oavsett om du är ny på GNU-Linux eller en erfaren användare så är  Mageias
 installerare utformad för att göra din installation eller uppgradering så
 enkel som möjligt.</para>
 
-  <para>Den första menyn har olika alternativ och det förvalda kommer att starta
-installationsprogrammet som i normalfallet är allt du behöver.</para>
+  <section>
+    <title>Installationsstegen</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Välkomstskärm för installationen</title>
 
-    <section>
-      <title>Använder en Mageia DVD</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>From this screen, you have access to options by pressing "<emphasis
-role="bold">e</emphasis>" to enter the edit mode. To come back to this
-screen, press either <emphasis role="bold">Esc</emphasis> key to quit
-without saving or press the key <emphasis role="bold">Ctrl</emphasis> or
-<emphasis role="bold">F10</emphasis> to quit with saving.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, it is possible to set some preferences (note that the
-options <emphasis role="bold">F1</emphasis> to <emphasis
-role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist>
-          <listitem>
-            <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis
-role="bold">F6</emphasis> options, you can view relevant help by pressing
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a
-specific language for the installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>If needed, change the screen resolution by pressing <emphasis
-role="bold">F3</emphasis> (Legacy mode only).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis role="bold">F6</emphasis> <emphasis
-role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis
-role="bold">e</emphasis> instead).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Default: It doesn't alter anything in the default options.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: Priority is given to the safer options at the price of a
-performance detriment.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI: (Advanced Configuration and Power Interface): Power management
-features are not used.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU
-interrupt. Select this option if you experience system misbehaviour like a
-kernel panic in relation to APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>När du väljer någon av dessa poster kommer det att ändra
-standardalternativen som visas på <guilabel>Boot Options</guilabel>-raden.</para>
-
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with
-<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot
-Options</guilabel> line, despite this, they will in fact be applied.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various
-boot options. Select an item with the arrow keys and press <emphasis
-role="bold">Enter</emphasis> for more details or press <emphasis
-role="bold">Esc</emphasis> to go back to the welcome screen.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>The detailed view about the splash option. Press <emphasis
-role="bold">Esc</emphasis> or select <guilabel>Return to Boot
-Options</guilabel> to go back to the options list. These options can be
-added by hand in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>För mer information om kernel-alternativ för legacy och UEFI-läge läs: <link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>Installationsstegen</title>
+    <section>
+      <title>UEFI Systems</title>
 
-    <para>The install process is divided into a number of steps, the status of which
-is indicated in a panel to the left of the screen.</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
-options.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
-about the particular step.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
-is possible to reboot, but please think twice before you do this. Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -174,19 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>Efter startmenyn så kom du inte till skärmen för språkval. Det kan hända med
-vissa grafikkort och äldre system. Prova med en låg upplösning genom att
-skriva <code>vgalo</code> vid prompten.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this press <emphasis role="bold">Esc</emphasis> at the first welcome screen
-and confirm with <emphasis role="bold">ENTER</emphasis>. You will be
-presented with a black screen with the word "boot:". Type "text" and press
-<emphasis role="bold">ENTER</emphasis> to continue with the installation in
-text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -194,11 +195,11 @@ text mode.</para>
     <section>
       <title>Installationen hänger sig</title>
 
-      <para>Om systemet verkar frysa sig under installationen så kan det bero på problem
-med identifiering av hårdvara. Om så är fallet så kan den automatiska
-hårdvaruidentifieringen förbigås och behandlas senare. För att prova detta,
-skriv <code>noauto</code> vid prompten. Detta kan även kombineras med andra
-alternativ om nödvändigt.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -206,17 +207,18 @@ alternativ om nödvändigt.</para>
 
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dynamiska partitioner</title>
 
-      <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis>
-format to <emphasis role="bold">dynamic</emphasis> format in Microsoft
-Windows, then it is not possible to install Mageia on this disc. To revert
-to a basic disk, see the Microsoft documentation: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/sv/locale.xml b/docs/docs/stable/installer/sv/locale.xml
new file mode 100644
index 00000000..5c35ef0a
--- /dev/null
+++ b/docs/docs/stable/installer/sv/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/sv/login.xml b/docs/docs/stable/installer/sv/login.xml
index c8425fa8..1eda9917 100644
--- a/docs/docs/stable/installer/sv/login.xml
+++ b/docs/docs/stable/installer/sv/login.xml
@@ -1,7 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="sv"><info><title xml:id="label-to-adapt-ti1">Inloggningsskärm</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>Inoggningsskärm för KDM</para></caption></mediaobject><para>Slutligen så kommer du till inloggningsskärmen.</para><para>Skriv in ditt användarnamn och lösenord och efter ett par sekunder befinner
-du dig i KDEs eller GNOMEs skrivbordsmiljö beroende på vilket
-installationsmedia du har använt. Du kan nu börja använda din installation
-av Mageia.</para><para>Du hittar mer dokumentation i <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">Mageias
-Wiki</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="sv">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/media_selection.xml b/docs/docs/stable/installer/sv/media_selection.xml
index 382eb7cb..e29c128a 100644
--- a/docs/docs/stable/installer/sv/media_selection.xml
+++ b/docs/docs/stable/installer/sv/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="sv">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Val av media (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject><imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1"
-fileref="dx2-media_selection.png"/></imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Här har du en lista över tillgängliga arkiv. Alla arkiv är inte tillgängliga
 beroende på vilket media du använder för att installera. Valet av arkiv
@@ -32,11 +41,11 @@ innehåller basen för distributionen.</para>
     </listitem>
 
     <listitem>
-      <para>Arkivet <emphasis>Nonfree</emphasis> innehåller paket som är gratis,
-dvs. Mageia får lov att omdistribuera dem men de innehåller programvara med
-stängd källkod (därav namnet Nonfree). Som ett exempel innehåller detta
-arkiv patentskyddade drivrutiner till grafikkort från nVidia och ATI, och
-även firmware till olika WiFi-kort.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/sv/minimal-install.xml b/docs/docs/stable/installer/sv/minimal-install.xml
index d09c8957..83b3c683 100644
--- a/docs/docs/stable/installer/sv/minimal-install.xml
+++ b/docs/docs/stable/installer/sv/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="sv">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="sv">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Minimal installation</title>
   </info>
@@ -10,30 +13,44 @@
 
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
-  <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+  
 
-  <para>Minimal Installation is intended for those with specific uses in mind for
-<application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the <emphasis
-role="bold">Individual package selection</emphasis> option mentioned above,
-to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>If you choose this installation method, then the relevant screen will offer
-you a few useful extras to install, such as documentation and X.</para>
+  
 
-  <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
 lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para>Grundläggande dokumentation tillhandahålls i form av man och info-sidor. Den
-innehåller man-sidor från <link
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
-Project</link> och <link
+Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
-coreutils</link> info-sidor.</para>
+coreutils</link> info pages.</para>
 
   <mediaobject>
 <imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
diff --git a/docs/docs/stable/installer/sv/misc-params.xml b/docs/docs/stable/installer/sv/misc-params.xml
index 3f4ad172..19dc59bf 100644
--- a/docs/docs/stable/installer/sv/misc-params.xml
+++ b/docs/docs/stable/installer/sv/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sv" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Sammanfattning av diverse parametrar</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
 
   <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
 the choices you made and on the hardware detected. You can check the
 settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>As a general rule, it is recommended that you accept the default settings
@@ -26,7 +42,7 @@ unless:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>some other factor mentionned in the detailed sections below is an issue.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,46 +54,47 @@ unless:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Tidszon</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
 can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Land / Region</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
 setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Starthanterare</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX har gjort bra val för hur startladdaren är inställd.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">För mer information, läs <xref linkend="setupBootloader"></xref></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Användarhantering</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">Du kan lägga till ytterligare användare här. De kommer att få varsin
-<literal>/home</literal>-katalog.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Tjänster</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
 (daemons).  This tool allows you to enable or disable certain processes.</para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Du bör vara försiktig med att ändra något här. Ett misstag kan göra att din
-dator inte fungerar korrekt.</para>
-
-        <para>För mer information, se <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -89,7 +106,7 @@ dator inte fungerar korrekt.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Tangentbord</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
 of keyboard.</para>
@@ -101,27 +118,32 @@ kommer lösenorden också att ändras.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Mus</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Här kan du lägga till eller konfigurera andra pekdon, pekplattor, styrkulor
 etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Ljudkort</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The
-option to select a different driver is only given when there is more than
-one driver for your card, but where none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Grafiskt gränssnitt</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">I det här avsnittet kan du konfigurera ditt grafikkort och bildskärm.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">För mer information, läs <xref linkend="configureX_chooser"></xref>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -136,11 +158,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Nätverk</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, using the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
@@ -150,13 +172,14 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxyservrar</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">En proxyserver agerar som en förmedlare mellan din dator och nätet. I den
-här sektionen kan du konfigurera din dator för att utnyttja en proxytjänst.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -168,26 +191,31 @@ need to enter here.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Säkerhetsnivå</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Här ställer du in säkerhetsnivån för din dator. I de flesta fall är
-standardinställningen (Standard) tillräcklig för normalt användande.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Kontrollera vilket val som passar dig bäst.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Brandvägg</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">En brandvägg är till för att agera som en barriär mellan din viktiga data
-och alla rackare ute på nätet som skulle försöka ta över eller stjäla den.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Välj vilka tjänster som du vill ha på ditt system. Det du väljer beror på
-vad du kommer att använda din dator till. Du hittar mer information på <xref
-linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Tänk på att om du tillåter allt (ingen brandvägg) så tar du en stor risk.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/sv/reboot.xml b/docs/docs/stable/installer/sv/reboot.xml
index 6d2ad0cc..15444cec 100644
--- a/docs/docs/stable/installer/sv/reboot.xml
+++ b/docs/docs/stable/installer/sv/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="sv" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Starta om</title>
   </info>
   
-  <para>När starthanteraren är installerad kommer du bli ombedd att ta bort LiveCDn
-och starta om datorn. Klicka på <emphasis
-role="bold"><guibutton>Klar</guibutton></emphasis> och gör som du blir
-ombedd<emphasis role="bold"> i den ordningen.</emphasis></para>
+  
+  <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/sv/securityLevel.xml b/docs/docs/stable/installer/sv/securityLevel.xml
index e220e7df..ea5736e6 100644
--- a/docs/docs/stable/installer/sv/securityLevel.xml
+++ b/docs/docs/stable/installer/sv/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sv" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Säkerhetsnivå</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject><imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/></imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Vänligen välj den önskade säkerhetsnivån</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended
-setting for the average user. The <emphasis role="bold">Secure</emphasis>
-setting will create a highly protected system - for instance if the system
-is to be used as a public server.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Säkerhetsadministratör</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
 which require notification to a system administrator.</para>
 
-  <para>A good, and easy-to-implement, choice is to enter &lt;user>@localhost -
-where &lt;user> is the login name of the user to receive these messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
 be configured for receiving such mail!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/sv/selectCountry.xml b/docs/docs/stable/installer/sv/selectCountry.xml
index cc98f90c..b34d4774 100644
--- a/docs/docs/stable/installer/sv/selectCountry.xml
+++ b/docs/docs/stable/installer/sv/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="sv">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="sv">
   <info>
     <title xml:id="selectCountry-ti1">Välj ditt land / region</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Välj ditt land eller region. Detta är viktigt för en rad olika inställningar
-som t. ex. valuta och trådlös domän. Felaktig inställning för land kan leda
-till att att det trådlösa nätverket inte fungerar.</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+like the currency and wireless regulatory domain. Setting the wrong country
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> option and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem that a country from the
-first list was chosen. Please ignore this, as DrakX will apply your actual
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,7 +40,7 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Inmatningsmetod</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
@@ -39,9 +50,9 @@ selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via <emphasis role="bold">Configure
-your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
-running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/selectInstallClass.xml b/docs/docs/stable/installer/sv/selectInstallClass.xml
index b4a8c18b..be77fa64 100644
--- a/docs/docs/stable/installer/sv/selectInstallClass.xml
+++ b/docs/docs/stable/installer/sv/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="sv" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Installation eller uppgradering</title>
   </info>
 
   <mediaobject>
-<imageobject><imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/></imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Installera</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option to perform a fresh installation of
-<application>Mageia</application>. This will format the root partition (/),
-but can preserve a separated /home partition.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Uppgradera</para>
-
-      <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that has reached
-its End Of Life, then it is better to do a clean install instead while
-preserving your <literal>/home</literal> partition.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that, and only if you are very sure
-rebooting is what you want, go to a text terminal by pressing <guilabel>Alt
-Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the <emphasis role="bold">Install or Upgrade</emphasis>
-screen to the language choice screen by pressing <guilabel>Alt Ctrl
-Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do
-this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sv/selectKeyboard.xml b/docs/docs/stable/installer/sv/selectKeyboard.xml
index b2ee61e7..c00139e2 100644
--- a/docs/docs/stable/installer/sv/selectKeyboard.xml
+++ b/docs/docs/stable/installer/sv/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="sv">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,19 +19,22 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Tangentbord</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX väljer ett passande tangentbord för ditt språk. Om inget hittas så
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX väljer ett passande tangentbord för ditt språk. Om inget hittas så
 väljer den ett tangentbord med amerikansk layout.</para>
 
   <mediaobject>
-<imageobject><imagedata fileref="dx2-selectKeyboard.png"
-align="center"/></imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
+</imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Försäkra dig om att valet är korrekt eller välj en annan
+      <para revision="1" xml:id="selectKeyboard-pa2">Försäkra dig om att valet är korrekt eller välj en annan
 tangenbordslayout. Om du inte vet vilken layout ditt tangentbord har,
 kontrollera specifikationen som följde med ditt system eller kontakta en
 datorleverantör. Det kan även finnas en etikett på tangentbordet som talar
@@ -27,23 +43,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a fuller list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this and
-continue the installation: the keyboard chosen from the full list will be
-applied.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
 extra dialogue screen asking how you would prefer to switch between the
 Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sv/selectKeyboardLive.xml b/docs/docs/stable/installer/sv/selectKeyboardLive.xml
index 36451037..b209f641 100644
--- a/docs/docs/stable/installer/sv/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/sv/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sv" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Välj tangentbord</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>Du måste ställa in vilken tangentbordslayout du vill använda i
-Mageia. Standard är satt beroende på vilket språk och tidszon du valt i
-förra steget.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/sv/selectLanguage.xml b/docs/docs/stable/installer/sv/selectLanguage.xml
index ed408bc2..d30913f7 100644
--- a/docs/docs/stable/installer/sv/selectLanguage.xml
+++ b/docs/docs/stable/installer/sv/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="sv" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,50 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Välj språk</title>
   </info>
 
-  <para condition="classical">Välj det språk du vill använda genom att först expandera listan för din
-kontinent. <application>Mageia</application> kommer att använda det här
-valet under installationen och till ditt installerade system.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Välj det språk du föredrar. <application>Mageia</application> använder det
-språket under installationen och i ditt installerade system.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">If it is likely that you (or others) will require several languages to be
-installed on your system, then you should use the <guibutton>Multiple
-languages</guibutton> option to add them now. It will be difficult to add
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
 extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
+  <important condition="classical">
     <para>Even if you choose more than one language, you must first choose one as your
-preferred language in the first language screen. It will also be marked as
-chosen in the multiple languages screen.</para>
-  </warning>
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
-      <para>Om ditt tangetbordspråk inte är samma som det språk du föredrar så bör du
-även installera språket för ditt tangetbord.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia använder UTF-8 (Unicode)-stöd som standard.</para>
-
-      <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple
-languages</emphasis> screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>Du kan ändra språket för ditt system efter installationen i Mageias
-kontrollcentral > System > Hantera språk.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sv/selectMouse.xml b/docs/docs/stable/installer/sv/selectMouse.xml
index 5f13585b..1223f2aa 100644
--- a/docs/docs/stable/installer/sv/selectMouse.xml
+++ b/docs/docs/stable/installer/sv/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="sv">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Välj mus</title>
   </info>
@@ -7,25 +13,28 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Om du inte är nöjd med hur din mus svarar så kan du välja en annan här.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Oftast så är <guilabel>Universiella</guilabel> - <guilabel>Alla PS/2 och
-USB-möss</guilabel> ett bra val.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Välj <guilabel>Universiell</guilabel> - <guilabel>Tvinga evdev</guilabel>
-för att konfigurera knapparna som inte fungerar på en mus med sex eller fler
-knappar.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/sv/setupBootloader.xml b/docs/docs/stable/installer/sv/setupBootloader.xml
index f2b27eeb..3ba23fec 100644
--- a/docs/docs/stable/installer/sv/setupBootloader.xml
+++ b/docs/docs/stable/installer/sv/setupBootloader.xml
@@ -1,146 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="sv" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="sv" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Huvudalternativ för startshanteraren</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Gränssnitt för starthanteraren</title>
-    <para>Som standard använder Mageia endast:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi för ett UEFI-system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>Mageias grafiska menyer är fina :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot
-choose between the <emphasis role="bold">with</emphasis> or <emphasis
-role="bold">without graphical menu</emphasis> options.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to house the bootloader
-(GRUB2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds GRUB2-efi. Although it is possible to have
-several ESPs, only one is required (and advised), whatever the number of
-operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Använder en startshanterare från Mageia</title>
-    <para>By default, and according to your system, Mageia writes one of the
-following:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then untick the <emphasis
-role="bold">Probe Foreign OS</emphasis> option.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
   <section>
-    <title>Använder en befintlig startshanterare</title>
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this documentation, however in most cases it will
-involve running the relevant bootloader installation program which should
-detect and add it automatically. See the documentation for the operating
-system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Använder kedjeladdning</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Alternativ</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>Första sidan</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you
-set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be required when booting
-to select a booting entry or change settings. The username is <emphasis
-role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will
-check that it matches with the one above.</para></listitem><listitem><para><guilabel>Avancerat</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for power management. It can save energy by
-stopping unused devices.  Deselecting it could be useful if, for example,
-your computer does not support ACPI or if you think the ACPI implementation
-might cause some problems (for instance random reboots or system lockups).</para></listitem><listitem><para><guilabel>Enable SMP</guilabel>: This option enables/disables symmetric
-multiprocessing for multi core processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the operating system access to
-the Advanced Programmable Interrupt Controller. APIC devices permit more
-complex priority models, and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC manages all external
-interrupts for a specific processor in an SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Huvudalternativ för startshanteraren</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Nästa sida</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Standard:</guilabel> Operativsystemet som startar som standard</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Tillägg:</guilabel> Med det här valet kan du ändra eller lägga
-till information till kärnan när du startar upp. </para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Undersök okänt OS</guilabel>: se ovan <link
-linkend="setupMageiaBootloader">Att använd Mageias starthanterare</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Avancerat</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-to be used by the boot menu. If you click the down triangle you will be
-offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Använder en befintlig startshanterare</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Lägg till eller ändra en post i bootmenyn</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/setupSCSI.xml b/docs/docs/stable/installer/sv/setupSCSI.xml
index b0075b72..2c9fa604 100644
--- a/docs/docs/stable/installer/sv/setupSCSI.xml
+++ b/docs/docs/stable/installer/sv/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="sv">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Ställ in SCSI</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject><imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/></imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
 SCSI controllers it may be unable to determine the correct drivers to use
 and subsequently fail to recognise the drive.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s)
-you have.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">DrakX bör sedan kunna konfigurera disken korrekt.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/sv/software.xml b/docs/docs/stable/installer/sv/software.xml
new file mode 100644
index 00000000..836022c6
--- /dev/null
+++ b/docs/docs/stable/installer/sv/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="sv" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/soundConfig.xml b/docs/docs/stable/installer/sv/soundConfig.xml
index 5a24c22f..f5893039 100644
--- a/docs/docs/stable/installer/sv/soundConfig.xml
+++ b/docs/docs/stable/installer/sv/soundConfig.xml
@@ -1,39 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="sv">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Ljudkonfiguration</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if one exists.</para>
+  
 
-  <para>Standard drivrutin bör fungera utan problem. Men om du efter installationen
-stöter på problem, kör <command>draksound</command> eller starta verktyget
-via MKC (Mageias Kontrollcentral) genom att välja fliken
-<guilabel>Hårdvara</guilabel> längst upp till höger på sidan.</para>
+  
 
-  <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis
-role="bold">Sound Configuration</emphasis> tool screen, click on
-<guibutton>Troubleshooting</guibutton> to find useful advice about how to
-solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Avancerat</title>
     </info>
 
-    <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in
-this screen, during install, is useful if there is no default driver and
-there are several drivers available, but you think the installer selected
-the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on <emphasis
-role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sv/takeOverHdConfirm.xml b/docs/docs/stable/installer/sv/takeOverHdConfirm.xml
index 404383f9..01fd3492 100644
--- a/docs/docs/stable/installer/sv/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/sv/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="sv">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Bekräfta hårddisken som ska formateras</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,16 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"><imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png"
-align="center"/></imageobject><imageobject condition="classical"><imagedata
-format="PNG" fileref="dx2-takeOverHdConfirm.png"
-align="center"/></imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is
-ok to erase every partition, every operating system and all data that might
-be on that hard disk.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/sv/testing.xml b/docs/docs/stable/installer/sv/testing.xml
index 062c612a..4119718f 100644
--- a/docs/docs/stable/installer/sv/testing.xml
+++ b/docs/docs/stable/installer/sv/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Testar Mageia som ett Live-system</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testar Mageia som ett Live-system</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,22 +17,20 @@
       <title xml:id="testing1-ti1">Live-läge</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>Du ser den här skärmen om du valde "Starta Mageia". Om inte så kommer du
-till steget för <link
-linkend="doPartitionDisks">Hårddiskpartitionering</link></para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Testar hårdvara</title>
       </info>
 
-      <para>Ett av målen med Liveläge är att testa så att all hårdvara hanteras korrekt
-av Mageia. Du kan kontrollera så att alla enheter har en drivrutin i
-hårdvarusektionen i Mageias kontrollcentral. Du kan testa de mest aktuella
-enheterna: </para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -37,11 +38,7 @@ enheterna: </para>
         </listitem>
 
         <listitem>
-          <para>grafik-kort: om du ser den föregående skärmen så är det redan OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webbkamera:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -49,7 +46,7 @@ enheterna: </para>
         </listitem>
 
         <listitem>
-          <para>skrivare: konfigurera den och skriv ut en test-sida</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -57,10 +54,13 @@ enheterna: </para>
         </listitem>
       </itemizedlist>
 
-      <para>Om allt är OK för dig så kan du fortsätta till installationen. Om inte så
-kan du lämna med Avsluta-knappen.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>Konfigurationsinställningarna som du gör här sparas inför installationen.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -68,15 +68,14 @@ kan du lämna med Avsluta-knappen.</para>
         <title xml:id="testing3-ti1">Påbörja installationen</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>Du kan starta installationen till hårddisken från en LiveCD elelr LiveDVD
-genom att klicka på ikonen "Installera på hårddisken". Du kommer då att se
-det här fönstret och <link
-linkend="doPartitionDisks">Partitionering</link>-steget" som en direkt
-fortsättning av installationen.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/sv/uninstall-Mageia.xml b/docs/docs/stable/installer/sv/uninstall-Mageia.xml
index 970c66e0..50396aeb 100644
--- a/docs/docs/stable/installer/sv/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/sv/uninstall-Mageia.xml
@@ -1,30 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="sv">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Avinstallera Mageia</title>
   </info>
 
   
 
+  
+
   <para>If Mageia didn't convince you or you can't install it correctly - in short
 you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-  <para>After your data backup, reboot your Mageia installation DVD and select
-<emphasis role="bold">Rescue system</emphasis>, then, <emphasis
-role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
-will only have Windows, with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>In Windows to recover the space used by Mageia partitions: click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code>. You will recognize a Mageia partition
-because they are labeled <guilabel>Unknown</guilabel>, and also by their
-size and place on the disk. Right click on each of these partitions and
-select <guibutton>Delete</guibutton> to free up the space.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-  <para>Om du använder Windows XP kan du skapa en ny partition och formatera den
-(FAT32 eller NTFS). Den blir tilldelad en enhetsbokstav.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>If you have Vista or 7, you have one more possibility, you can extend the
 existing partition that is at the left of the freed space. There are other
@@ -32,4 +45,4 @@ partitioning tools that can be used, such as <emphasis
 role="bold">gparted</emphasis>, available for both Windows and Linux. As
 always, when changing partitions, be very careful to back up anything
 important to you.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sv/unused.xml b/docs/docs/stable/installer/sv/unused.xml
index eda122a9..e3e2d60a 100644
--- a/docs/docs/stable/installer/sv/unused.xml
+++ b/docs/docs/stable/installer/sv/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sv" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="sv">
   <info>
     <title xml:id="unused-ti1">Behåll eller radera oanvänt material</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
 
-  <para>I det här steget letar installationsprogrammet efter oanvända språk och
-hårdvarupaket, sedan föreslås att du raderar dem. Det är en bra idé att
-acceptera detta om du inte tänker förbereda en installation som ska köras på
-annan hårdvara.</para>
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>I nästa steg kopieras filerna till hårddisken. Det kan ta lite tid och du
-kommer att få en blank skärm i slutet vilket är normalt.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/tg/DrakLive-cover.xml b/docs/docs/stable/installer/tg/DrakLive-cover.xml
new file mode 100644
index 00000000..5bae0247
--- /dev/null
+++ b/docs/docs/stable/installer/tg/DrakLive-cover.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="tg" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
+  <info>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Installation from LIVE medium</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
+        <revremark>Mageia 5</revremark>
+      </revision>
+    </revhistory>
+
+    <cover>
+      <para role="tagline">The Official Documentation for Mageia</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>
+    </cover>
+  </info>
+
+  <article>
+    <title>Installation from LIVE medium</title>
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the choices you make
+while installing.</para>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
+
+    <xi:include href="acceptLicense.xml"/>
+
+    <xi:include href="configureTimezoneUTC.xml"/>
+
+    <xi:include href="bestTime.xml"/>
+
+    <xi:include href="selectKeyboardLive.xml"/>
+
+    <xi:include href="testing.xml"/>
+
+    <xi:include href="diskPartitioning.xml"/>
+
+    
+
+    <!-- <xi:include href="doPartitionDisks.xml"/>
+
+
+    <xi:include href="ask_mntpoint_s.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
+
+    <xi:include href="diskdrake.xml"/>
+
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
+
+    <xi:include href="setupBootloader.xml"/>
+
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
+
+    <xi:include href="addUser.xml"/>
+
+    <xi:include href="login.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/tg/DrakLive.xml b/docs/docs/stable/installer/tg/DrakLive.xml
new file mode 100644
index 00000000..470b3300
--- /dev/null
+++ b/docs/docs/stable/installer/tg/DrakLive.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="tg" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  <info>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Installation from LIVE medium</title>
+
+    <cover>
+      <para><note>
+          <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the 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>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>
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="bootLive.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="bestTime.xml"/>
+
+  <xi:include href="selectKeyboardLive.xml"/>
+
+  <xi:include href="testing.xml"/>
+
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
+
+  <xi:include href="addUser.xml"/>
+
+  <xi:include href="login.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
diff --git a/docs/docs/stable/installer/tg/DrakX-cover.xml b/docs/docs/stable/installer/tg/DrakX-cover.xml
new file mode 100644
index 00000000..6ff19fd1
--- /dev/null
+++ b/docs/docs/stable/installer/tg/DrakX-cover.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="tg" xml:id="Quick-Startup"
+      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 DrakX</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>February 2014</date>
+
+        <revremark>Mageia 4</revremark>
+      </revision>
+    </revhistory>
+
+    <cover>
+      <para role="tagline">The Official Documentation for Mageia</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>
+    </cover>
+  </info>
+
+  <article>
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
+<title>Installation with DrakX</title>
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the choices you make
+while installing.</para>
+      </note></para>
+
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="installer.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
+
+    <xi:include href="acceptLicense.xml"/>
+
+    <xi:include href="setupSCSI.xml"/>
+
+    <xi:include href="selectInstallClass.xml"/>
+
+    <xi:include href="selectKeyboard.xml"/>
+
+    
+
+    
+
+    
+
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
+
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
+
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+    <xi:include href="software.xml"/>
+
+    
+
+    <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+    <xi:include href="graphicalConfiguration.xml"/>
+
+    
+
+    <!-- <xi:include href="configureX_card_list.xml"/>
+
+
+    <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
+
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+    <xi:include href="locale.xml"/>
+
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
+
+
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
+
+    <xi:include href="selectMouse.xml"/>
+
+    <xi:include href="soundConfig.xml"/>
+
+    <xi:include href="securityLevel.xml"/>
+
+    <xi:include href="firewall.xml"/>
+
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
+</xi:include> -->
+<xi:include href="installUpdates.xml"/>
+
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/tg/DrakX-inline.xml b/docs/docs/stable/installer/tg/DrakX-inline.xml
new file mode 100644
index 00000000..878ba88f
--- /dev/null
+++ b/docs/docs/stable/installer/tg/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="tg" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Installation with DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the 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>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>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/DrakX.xml b/docs/docs/stable/installer/tg/DrakX.xml
new file mode 100644
index 00000000..53a1c501
--- /dev/null
+++ b/docs/docs/stable/installer/tg/DrakX.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="tg" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Installation with DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the 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>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>
+    </cover>
+  </info>
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  
+
+  
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
+
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
+
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="graphicalConfiguration.xml"/>
+
+  
+
+  <!-- <xi:include href="configureX_chooser.xml"/>
+
+  
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+  
+
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
+
+
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  <xi:include href="firewall.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:include> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
diff --git a/docs/docs/stable/installer/tg/SelectAndUseISOs2.xml b/docs/docs/stable/installer/tg/SelectAndUseISOs2.xml
new file mode 100644
index 00000000..b787e513
--- /dev/null
+++ b/docs/docs/stable/installer/tg/SelectAndUseISOs2.xml
@@ -0,0 +1,384 @@
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="tg" xml:id="Select-and-use-ISOs">
+  
+  
+  
+  
+  
+  
+  
+  <info>
+    <!-- Made by Lebarhon 2014 03 26 
+
+Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
+<title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
+  </info>
+  <section>
+    <title>Муқаддима</title>
+    <para>Mageia is distributed via ISO images. This page will help you to choose
+which image best suits your needs.</para>
+    <para>There are three types of installation media:</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
+      </listitem>
+    </itemizedlist>
+    <para>More details are given in the next sections.</para>
+  </section>
+  <section>
+    <title>Media</title>
+    <section>
+      <title>Definition</title>
+      <para>Here, a medium (plural: media) is an ISO image file that allows you to
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
+      <para>You can find Mageia ISO's <link
+ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
+    </section>
+    <section>
+      <title>Classical installation media</title>
+      <section>
+        <title>Common features</title>
+        <itemizedlist>
+          <listitem>
+            <para>These ISOs use the Classical installer called DrakX</para>
+          </listitem>
+          <listitem>
+            <para>They are used for performing clean installs or to upgrade a previously
+installed version of Mageia</para>
+          </listitem>
+          <listitem>
+            <para>Different media for 32 and 64-bit architectures</para>
+          </listitem>
+          <listitem>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
+          </listitem>
+          <listitem>
+            <para>Each DVD contains many available desktop environments and languages</para>
+          </listitem>
+          <listitem>
+            <para>You'll be given the choice during the installation to add non-free software</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+    </section>
+    <section>
+      <title>Live media</title>
+      <section>
+        <title>Common features</title>
+        <itemizedlist>
+          <listitem>
+            <para>Can be used to preview the Mageia operating system without having to install
+it</para>
+          </listitem>
+          <listitem>
+            <para>The Live media also includes an Installer.</para>
+          </listitem>
+          <listitem>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
+          </listitem>
+          <listitem>
+            <para>Different media for 32 and 64-bit architectures</para>
+          </listitem>
+          <listitem>
+            <para>They contain non-free software</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+      <section>
+        <title>Live DVD Plasma</title>
+        <itemizedlist>
+          <listitem>
+            <para>Plasma desktop environment only</para>
+          </listitem>
+          <listitem>
+            <para>All available languages are present</para>
+          </listitem>
+          <listitem>
+            <para>64-bit architecture only</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+      <section>
+        <title>Live DVD GNOME</title>
+        <itemizedlist>
+          <listitem>
+            <para>GNOME desktop environment only</para>
+          </listitem>
+          <listitem>
+            <para>All available languages are present</para>
+          </listitem>
+          <listitem>
+            <para>64-bit architecture only</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+      <section>
+        <title>Live DVD Xfce</title>
+        <itemizedlist>
+          <listitem>
+            <para>Xfce desktop environment only</para>
+          </listitem>
+          <listitem>
+            <para>All available languages are present</para>
+          </listitem>
+          <listitem>
+            <para>32 or 64-bit architectures</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+    </section>
+    <section>
+      <title>Net install media</title>
+      <section>
+        <title>Common features</title>
+        <itemizedlist>
+          <listitem>
+            <para>Different media for 32 and 64-bit architectures</para>
+          </listitem>
+          <listitem>
+            <para>First steps are English language only</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+      <section>
+        <title>netinstall.iso</title>
+        <itemizedlist>
+          <listitem>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+      <section>
+        <title>netinstall-nonfree.iso</title>
+        <itemizedlist>
+          <listitem>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+    </section>
+  </section>
+  <section>
+    <title>Downloading and Checking Media</title>
+    <section>
+      <title>Downloading</title>
+      <para>Once you have chosen your ISO file, you can download it using either http or
+BitTorrent. In both cases, you are provided with some information, such as
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
+    </section>
+    <section>
+      <title xml:id="integrity">Checking the integrity of the downloaded media</title>
+      <para>The checksums referred to earlier, are digital fingerprints generated by an
+algorithm from the file to be downloaded. You may compare the checksum of
+your downloaded ISO against that of the original source ISO. If the
+checksums do not match, it means that the actual data on the ISO's do not
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
+      <para>To generate the checksum for your downloaded ISO, open a console, (no need
+to be root), and:</para>
+      <itemizedlist>
+        <listitem>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+        <listitem>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+      </itemizedlist>
+      <para>Example:</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
+    </section>
+  </section>
+  <section>
+    <title>Burn or dump the ISO</title>
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
+actually be created.</para>
+    <section>
+      <title>Burning the ISO to a CD/DVD</title>
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
+ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
+wiki</link> for more information.</para>
+    </section>
+    <section>
+      <title>Dump the ISO to a USB stick</title>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
+      <warning>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
+      </warning>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
+      <section>
+        <title>Using a graphical tool within Mageia</title>
+        <para>You can use a graphical tool like <link
+ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
+      </section>
+      <section>
+        <title>Using a graphical tool within Windows</title>
+        <para>You could try:</para>
+        <itemizedlist>
+          <listitem>
+            <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option</para>
+          </listitem>
+          <listitem>
+            <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
+Imager</link></para>
+          </listitem>
+        </itemizedlist>
+      </section>
+      <section>
+        <title>Using the Command line within a GNU/Linux system</title>
+        <warning>
+          <para>It is potentially *dangerous* to do this by hand. You risk overwriting
+potentially valuable existing data if you specify the wrong target device.</para>
+        </warning>
+        <orderedlist>
+          <listitem>
+            <para>Open a console</para>
+          </listitem>
+          <listitem>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
+            <mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
+          </listitem>
+          <listitem>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
+          </listitem>
+          <listitem>
+            <para>Enter the command <command>fdisk -l</command></para>
+            <mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
+          </listitem>
+          <listitem>
+            <para>Find the device name for your USB stick (by its size), for example
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
+            <para>Alternatively, you can find the device name with the command
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
+size is 2GB:</para>
+            <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
+[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+[72594.770536] usb 1-1: Product: Mass Storage Device
+[72594.770537] usb 1-1: Manufacturer: JetFlash
+[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB
+[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected
+[72594.772447] scsi host8: usb-storage 1-1:1.0
+[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 PQ: 0 ANSI: 4
+[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)
+[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off
+[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00
+[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
+[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
+[72595.967251]  <emphasis>sdd</emphasis>: sdd1
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
+          </listitem>
+          <listitem>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
+            <tip>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
+            </tip>
+          </listitem>
+          <listitem>
+            <para>Enter the command: <command>sync</command></para>
+          </listitem>
+          <listitem>
+            <para>This is the end of the process, and you may now unplug your USB stick.</para>
+          </listitem>
+        </orderedlist>
+      </section>
+    </section>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/acceptLicense.xml b/docs/docs/stable/installer/tg/acceptLicense.xml
new file mode 100644
index 00000000..f22c3a8c
--- /dev/null
+++ b/docs/docs/stable/installer/tg/acceptLicense.xml
@@ -0,0 +1,98 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="acceptLicense" version="5.0" xml:lang="tg">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 27 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- JohnR: minor mods 2012-3-30 -->
+<!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
+<!-- JohnR: 2012-04-05 - Inserted text from barjac with some modifications:
+       http://mtf.no-ip.co.uk/doc/help/license.html  -->
+<!-- marja:2012-04-05 - having a look because this isn't a DocBook5.0 type anymore,
+       but text/xml. First changing centimetres in screenshot to pixels ( 
+       ), after that nested the two existing sections into a third one-->
+<!-- removed para id's, corrected duplicate id's for segments, marja, 20120409 -->
+<!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
+       sure what is causing the corruption -->
+<!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
+<title xml:id="acceptLicense-ti1">Иҷозатнома ва тавзеҳи барориш</title>
+  </info>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="acceptLicense-im1" fileref="dx2-license.png" align="center"
+revision="4"/> </imageobject> <imageobject> <imagedata format="PNG"
+fileref="live-license.png" xml:id="acceptLicense-im2" revision="5"
+align="center" condition="live"/> </imageobject></mediaobject>
+
+  <section xml:id="license">
+    <info>
+      <title xml:id="license-ti1">License Agreement</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
+
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
+
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
+
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
+
+    
+  <!-- if you want two sections in a file, both need to be nested in a third section -
+       marja, 20120405  -->
+</section>
+
+  <section xml:id="releaseNotes">
+    <!--
+  <para>
+Release Notes</para>
+-->
+<info>
+      <title xml:id="releaseNotes-ti1">Тавзеҳи барориш</title>
+    </info>
+
+    
+
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/addUser.xml b/docs/docs/stable/installer/tg/addUser.xml
new file mode 100644
index 00000000..f4eb1bed
--- /dev/null
+++ b/docs/docs/stable/installer/tg/addUser.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="addUser-ti1">User Management</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
+  <section xml:id="root-password">
+    <info>
+      <title xml:id="root-password-ti2">Set Administrator (root)  Password:</title>
+    </info>
+
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
+
+    <note xml:id="givePassword">
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
+    </note>
+  </section>
+
+  <section xml:id="enterUser">
+    <info>
+      <title xml:id="enterUser-ti3">Enter a user</title>
+    </info>
+
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
+
+        <para>Click on this button if you want to change the user's icon</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
+
+      <para>You can add any extra needed users in the <emphasis>Configuration -
+Summary</emphasis> step during the install. Choose <emphasis>User
+management</emphasis>.</para>
+
+      <para>The access permissions can also be changed after the install.</para>
+    </note>
+  </section>
+
+  <section condition="classical" xml:id="addUserAdvanced">
+    <info>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
+    </info>
+
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
+shell available to any user you added in the previous screen. Options are
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/tg/add_supplemental_media.xml b/docs/docs/stable/installer/tg/add_supplemental_media.xml
new file mode 100644
index 00000000..95ab2945
--- /dev/null
+++ b/docs/docs/stable/installer/tg/add_supplemental_media.xml
@@ -0,0 +1,57 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="tg">
+  <info>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- papoteur 2013-04-13  - created -->
+<!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
+<!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
+<imageobject> <imagedata format="PNG"
+fileref="dx2-add_supplemental_media.png"
+xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
+</imageobject></mediaobject>
+
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
+
+  <para>For a network source, there are two steps to follow:</para>
+
+  <orderedlist>
+    <listitem>
+      <para>Choosing and activating the network, if not already up.</para>
+    </listitem>
+
+    <listitem>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
+    </listitem>
+  </orderedlist>
+
+  <note>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/ask_mntpoint_s.xml b/docs/docs/stable/installer/tg/ask_mntpoint_s.xml
new file mode 100644
index 00000000..04f43079
--- /dev/null
+++ b/docs/docs/stable/installer/tg/ask_mntpoint_s.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="ask_mntpoint_s-ti1">Нуқтаи насбкуниро интихоб намоед</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Made by marja on 2012 03 28 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
+<!-- removed para xml:id's, marja, 20120409 -->
+<!-- barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
+       with "a", as I can't imagine having more than one root partition ;) -->
+<!-- Lebarhon : I put [] where it seems having mistakes -->
+<!-- Marja: you're right, in English English it is "its type", however, the Americans
+       write "it's type". And you're right about the redundant part, too, I removed it-->
+<!-- And JohnR says the Americans are WRONG! :-)) -->
+<!-- 2012-04-19  Language proofreading done -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
+    </listitem>
+
+    <listitem>
+      <para>For any partitions that you don't need to make use of, you can leave the
+mount point field blank.</para>
+    </listitem>
+  </itemizedlist>
+
+  <warning>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
+  </warning>
+
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/tg/bestTime.xml b/docs/docs/stable/installer/tg/bestTime.xml
new file mode 100644
index 00000000..71d5dcb6
--- /dev/null
+++ b/docs/docs/stable/installer/tg/bestTime.xml
@@ -0,0 +1,17 @@
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="tg" xml:id="bestTime">
+  
+  
+  <info>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
+  </info>
+  <mediaobject condition="live">
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/bootLive.xml b/docs/docs/stable/installer/tg/bootLive.xml
new file mode 100644
index 00000000..b8f4275e
--- /dev/null
+++ b/docs/docs/stable/installer/tg/bootLive.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Booting the medium</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>First screen while booting in BIOS mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">In UEFI mode</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/tg/chooseDesktop.xml b/docs/docs/stable/installer/tg/chooseDesktop.xml
new file mode 100644
index 00000000..f8ffa46c
--- /dev/null
+++ b/docs/docs/stable/installer/tg/chooseDesktop.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<info>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Интихоби мизи корӣ</title>
+  </info>
+
+  
+
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
+
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
+
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/tg/choosePackageGroups.xml b/docs/docs/stable/installer/tg/choosePackageGroups.xml
new file mode 100644
index 00000000..5f1a33f3
--- /dev/null
+++ b/docs/docs/stable/installer/tg/choosePackageGroups.xml
@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tg" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
+  <info>
+    <title xml:id="choosePackageGroups-ti1">Интихоби Гурӯҳи Қуттиҳо</title>
+  </info>
+
+  
+
+  
+
+  <mediaobject>
+<!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
+align="center"/> </imageobject></mediaobject>
+
+  <para>Packages are arranged into common groups, to make choosing what you need on
+your system a lot easier. The groups are fairly self explanatory, however
+more information about the content of each is available in tool-tips which
+become visible as the mouse is hovered over them.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para><emphasis role="bold">Workstation</emphasis></para>
+    </listitem>
+
+    <listitem>
+      <para><emphasis role="bold">Server</emphasis></para>
+    </listitem>
+
+    <listitem>
+      <para><emphasis role="bold">Graphical Environment</emphasis></para>
+    </listitem>
+
+    <listitem>
+      <para><emphasis role="bold">Individual Package Selection</emphasis>: you can use
+this option to manually add or remove packages</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>See <xref linkend="minimal-install"/> for instructions on how to do a
+minimal install (without or with X &amp; IceWM).</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/choosePackagesTree.xml b/docs/docs/stable/installer/tg/choosePackagesTree.xml
new file mode 100644
index 00000000..bbfcf7b1
--- /dev/null
+++ b/docs/docs/stable/installer/tg/choosePackagesTree.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="tg">
+  <info>
+    <title xml:id="choosePackagesTree-ti1">Choose Individual Packages</title>
+  </info>
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
+align="center"/> </imageobject></mediaobject>
+
+  <para>Here you can add or remove any extra packages to customize your
+installation.</para>
+
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/configureServices.xml b/docs/docs/stable/installer/tg/configureServices.xml
new file mode 100644
index 00000000..000150d8
--- /dev/null
+++ b/docs/docs/stable/installer/tg/configureServices.xml
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="tg" xml:id="configureServices">
+  <info>
+    <title xml:id="configureServices-ti1">Configure your Services</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
+<!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
+<imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
+xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
+
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">If you highlight a service, some information about it is shown in the info
+box below.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para xml:id="configureServices-pa5" revision="1">Only change things when you know very well what you are doing.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/configureTimezoneUTC.xml b/docs/docs/stable/installer/tg/configureTimezoneUTC.xml
new file mode 100644
index 00000000..0ecf7645
--- /dev/null
+++ b/docs/docs/stable/installer/tg/configureTimezoneUTC.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="tg">
+  <info>
+    <title xml:id="configureTimezoneUTC-ti6">Минтақаи вақти худро танзим кунед</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
+<!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<imageobject condition="classical"> <imagedata format="PNG"
+xml:id="configureTimezoneUTC-im1" align="center"
+fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
+or to GMT, also known as UTC.</para>
+
+  <note>
+    <para revision="1" xml:id="configureTimezoneUTC-pa3">If you have more than one operating system on your computer, make sure they
+are all set to local time, or all to UTC/GMT.</para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/configureX_card_list.xml b/docs/docs/stable/installer/tg/configureX_card_list.xml
new file mode 100644
index 00000000..a515f6ef
--- /dev/null
+++ b/docs/docs/stable/installer/tg/configureX_card_list.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!-- Initiated by Marja  2012-08-08 -->
+<!-- Further text JohnR  2012-08-29 -->
+<!-- tproof  -->
+<!-- lproof  -->
+<!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
+
+  <para>DrakX has a very comprehensive database of video cards and will usually
+correctly identify your video device.</para>
+
+  <para>If the installer has not correctly detected your graphic card and you know
+which one you have, you can select it from the tree by: <itemizedlist>
+      <listitem>
+        <para>Vendor</para>
+      </listitem>
+
+      <listitem>
+        <para>then the make of your card</para>
+      </listitem>
+
+      <listitem>
+        <para>and the model of card</para>
+      </listitem>
+    </itemizedlist></para>
+
+  <para>If you cannot find your card in the vendor lists (because it's not yet in
+the database or it's an older card) you may find a suitable driver in the
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
+
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
+
+  <para>Some video card manufacturers provide proprietary drivers for Linux which
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/tg/configureX_chooser.xml b/docs/docs/stable/installer/tg/configureX_chooser.xml
new file mode 100644
index 00000000..5d94f997
--- /dev/null
+++ b/docs/docs/stable/installer/tg/configureX_chooser.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="configureX_chooser-ti1">Graphic Card and Monitor Configuration</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
+
+  <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
+    </listitem>
+  </itemizedlist>
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/tg/configureX_monitor.xml b/docs/docs/stable/installer/tg/configureX_monitor.xml
new file mode 100644
index 00000000..a34ca00d
--- /dev/null
+++ b/docs/docs/stable/installer/tg/configureX_monitor.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!-- Initiated by Marga 2012-8-09 -->
+<!-- Further text JohnR  2012-08-30 -->
+<!-- tproof -->
+<!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
+<title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
+  </info>
+
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX has a very comprehensive database of monitors and will usually
+correctly identify yours.</para>
+
+  <warning>
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
+could damage your monitor or video hardware. Please don't try something
+without knowing what you are doing.</emphasis> If in doubt you should
+consult your monitor documentation.</para>
+  </warning>
+
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
+
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
+
+        <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
+type with a sync range that is beyond the capabilities of your monitor: you
+may damage your monitor. If in doubt, choose a conservative setting and
+consult your monitor documentation.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can select it from the tree by selecting:</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
+
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
+
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/tg/diskPartitioning.xml b/docs/docs/stable/installer/tg/diskPartitioning.xml
new file mode 100644
index 00000000..efdeb9a9
--- /dev/null
+++ b/docs/docs/stable/installer/tg/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="en" version="5.0" xml:lang="tg">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/diskdrake.xml b/docs/docs/stable/installer/tg/diskdrake.xml
new file mode 100644
index 00000000..977cc871
--- /dev/null
+++ b/docs/docs/stable/installer/tg/diskdrake.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+    
+    
+
+  <info>
+    <!-- Lebarhon 2016 12 16 updated for Mageia 6
+
+Lebarhon 20170902 added SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
+  </info>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
+
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
+
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
+
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
+
+  <figure>
+    <title>EFI System Partition</title>
+
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
+
+  <figure>
+    <title>BIOS boot partition</title>
+
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/tg/doPartitionDisks.xml b/docs/docs/stable/installer/tg/doPartitionDisks.xml
new file mode 100644
index 00000000..005ae5c0
--- /dev/null
+++ b/docs/docs/stable/installer/tg/doPartitionDisks.xml
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
+lebarhon 20170209 added SC-->
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
+  </info>
+
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
+
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa5">If this option is available, then existing Linux compatible partitions have
+been found and may be used for the installation.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa7">If you have unused space on your hard drive then this option will use it for
+your new Mageia installation.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
+
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
+
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
+partition must be "clean", meaning that Windows must have closed down
+correctly the last time it was used. It must also have been defragmented,
+although this is not a guarantee that all files in the partition have been
+moved out of the area that is about to be used. It is highly recommended to
+back up your personal files.</para>
+      </important>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa17">This gives you complete control over the placing of the installation on your
+hard drive(s).</para>
+    </listitem>
+  </itemizedlist>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
+
+  <note>
+    <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
+  </note>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
+
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+
+  <important>
+    <para>Some newer drives are now using 4096 byte logical sectors, instead of the
+previous standard of 512. Due to lack of available hardware, the
+partitioning tool used in the installer has not been tested with such a
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Also make sure all partitions are created using an even number of megabytes.</para>
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/tg/exitInstall.xml b/docs/docs/stable/installer/tg/exitInstall.xml
new file mode 100644
index 00000000..b5100682
--- /dev/null
+++ b/docs/docs/stable/installer/tg/exitInstall.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0" xml:lang="tg">
+  <info>
+    <title xml:id="exitInstall-ti1">Табрик</title>
+  </info>
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
+<imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
+align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
+
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
+
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
+
+  <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the settings for the bootloader, your Mageia install
+will be automatically selected and started.</para>
+
+  <para xml:id="exitInstall-pa4" revision="1">Enjoy!</para>
+
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/firewall.xml b/docs/docs/stable/installer/tg/firewall.xml
index 431f1d18..746aced0 100644
--- a/docs/docs/stable/installer/tg/firewall.xml
+++ b/docs/docs/stable/installer/tg/firewall.xml
@@ -1,33 +1,37 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="tg">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="tg" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Девори оташ</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Девори оташ</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows to configure some simple firewall rules: they determine
-which type of message from the Internet will be accepted by the target
-system. This, in turn, allows the corresponding services on the system to be
-accessible from the Internet.</para>
+  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+determine which type of message from the Internet will be accepted by the
+target system. This, in turn, allows the corresponding services on the
+system to be accessible from the Internet.</para>
 
-  <para>In the default setting, no button is checked - no service of the system is
-accessibly from the network. The "<emphasis>Everything (no
-firewall)</emphasis>" button has a particular role: it enables access to all
-services of the machine - an option that does not make much sense in the
-context of the installer since it would create a totally unprotected
-system.  Its veritable use is in the context of the Mageia Control Center
-(which uses the same GUI layout) for temporarily disabling the entire set of
-firewall rules for testing and debugging purposes.</para>
+  <para>In the default setting (no button is checked), no service of the system is
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
+debugging purposes.</para>
 
-  <para>All other checkbuttons are more or less self-explanatory. As an example, you
-will check the "CUPS server" button if you want printers on your machine to
-be accessible from the network.</para>
+  <para>All other options are more or less self-explanatory. As an example, you will
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The set of checkbuttons only comprises the most common services. The
-"Advanced" button allows to enable messages that correspond to a service for
-which no checkbutton exists. The "<emphasis>Advanced</emphasis>" button
-opens a window where you can enable a series of services by typing a list of
-couples (blank separated)</para>
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
+separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
 
diff --git a/docs/docs/stable/installer/tg/formatPartitions.xml b/docs/docs/stable/installer/tg/formatPartitions.xml
new file mode 100644
index 00000000..c9141a85
--- /dev/null
+++ b/docs/docs/stable/installer/tg/formatPartitions.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="formatPartitions-ti1">Formatting</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Made by marja on 2012 03 29 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- marja 2012-04-24 added screenshot -->
+<!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
+partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
+
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
+
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
+
+  <tip>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
+  </tip>
+
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/tg/graphicalConfiguration.xml b/docs/docs/stable/installer/tg/graphicalConfiguration.xml
new file mode 100644
index 00000000..49a77061
--- /dev/null
+++ b/docs/docs/stable/installer/tg/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/tg/installUpdates.xml b/docs/docs/stable/installer/tg/installUpdates.xml
new file mode 100644
index 00000000..47a0cc0f
--- /dev/null
+++ b/docs/docs/stable/installer/tg/installUpdates.xml
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="tg">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja, 2012-04-24 added screenshot -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Нав кардан</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
+align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
+
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
+aren't connected to the Internet</para>
+    </listitem>
+
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/installer.xml b/docs/docs/stable/installer/tg/installer.xml
new file mode 100644
index 00000000..201cec89
--- /dev/null
+++ b/docs/docs/stable/installer/tg/installer.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="installer"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
+  </info>
+
+  <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
+Installer is designed to help make your installation or upgrade as easy as
+possible.</para>
+
+  <section>
+    <title>The installation steps</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
+
+  <section>
+    <title>Installation Welcome Screen</title>
+
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
+
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
+
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
+
+      <itemizedlist>
+        <title>Menu</title>
+
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section>
+      <title>UEFI Systems</title>
+
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
+
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
+
+      <itemizedlist>
+        <title>Menu</title>
+
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
+  </section>
+
+  <section>
+    <title>Installation Problems and Possible Solutions</title>
+
+    <section>
+      <title>No Graphical Interface</title>
+
+      <itemizedlist>
+        <listitem>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
+        </listitem>
+
+        <listitem>
+          <para>If the hardware is very old, a graphical installation may not be
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section>
+      <title>The Install Freezes</title>
+
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
+    </section>
+
+    <section>
+      <title>RAM problem</title>
+
+      <para>This will rarely be needed, but in some cases the hardware may report the
+available RAM incorrectly. To specify this manually, you can use the
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
+    </section>
+
+    <section>
+      <title>Dynamic partitions</title>
+
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
+ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/tg/locale.xml b/docs/docs/stable/installer/tg/locale.xml
new file mode 100644
index 00000000..b3e24f34
--- /dev/null
+++ b/docs/docs/stable/installer/tg/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/tg/login.xml b/docs/docs/stable/installer/tg/login.xml
new file mode 100644
index 00000000..c92e57d4
--- /dev/null
+++ b/docs/docs/stable/installer/tg/login.xml
@@ -0,0 +1,22 @@
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="tg">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/media_selection.xml b/docs/docs/stable/installer/tg/media_selection.xml
new file mode 100644
index 00000000..927e4aab
--- /dev/null
+++ b/docs/docs/stable/installer/tg/media_selection.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+  
+  <mediaobject>
+<!-- papoteur 2013-04-11  - created -->
+<!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
+<!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
+<!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
+
+  <para>Here you have the list of available repositories. Not all repositories are
+available, according to which media you use for installing. The repositories
+selection determines which packages will be available for selection during
+the next steps.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>The <emphasis>Core</emphasis> repository cannot be disabled as it contains
+the base of the distribution.</para>
+    </listitem>
+
+    <listitem>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
+    </listitem>
+
+    <listitem>
+      <para>The <emphasis>Tainted</emphasis> repository includes packages released under
+a free license. The main criteria for placing packages in this repository is
+that they may infringe patents and copyright laws in some countries,
+e.g. multimedia codecs needed to play various audio/video files; packages
+needed to play commercial video DVD's, etc.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/tg/minimal-install.xml b/docs/docs/stable/installer/tg/minimal-install.xml
new file mode 100644
index 00000000..68b35004
--- /dev/null
+++ b/docs/docs/stable/installer/tg/minimal-install.xml
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="tg">
+  <!--2012-12-26 marja - exported this section from choosePackages.xml to
+ start a new page-->
+<!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
+<info>
+    <title xml:id="minimal-install-ti1">Minimal Install</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
+lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
+xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
+Project</link> and the <link
+xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
+coreutils</link> info pages.</para>
+
+  <mediaobject>
+<imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
+align="center" fileref="dx2-minimal-install.png" revision="1"/>
+</imageobject></mediaobject>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/misc-params.xml b/docs/docs/stable/installer/tg/misc-params.xml
new file mode 100644
index 00000000..a59a6641
--- /dev/null
+++ b/docs/docs/stable/installer/tg/misc-params.xml
@@ -0,0 +1,223 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tg" xml:id="misc-params">
+  <info>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
+
+  <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
+the choices you made and on the hardware detected. You can check the
+settings here and change them if you want by pressing
+<emphasis>Configure</emphasis>.</para>
+
+  <note>
+    <para>As a general rule, it is recommended that you accept the default settings
+unless:<itemizedlist>
+        <listitem>
+          <para>there are known issues with a default setting</para>
+        </listitem>
+
+        <listitem>
+          <para>the default setting has already been tried and it fails</para>
+        </listitem>
+
+        <listitem>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
+        </listitem>
+      </itemizedlist></para>
+  </note>
+
+  <section xml:id="misc-params-system">
+    <info>
+      <title xml:id="misc-params-system-ti2">System parameters</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
+
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
+can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
+
+        <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
+setting.  See <xref linkend="selectCountry"/></para>
+      </listitem>
+
+      <listitem>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
+
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
+
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
+
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
+
+      <listitem>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
+
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
+      </listitem>
+
+      <listitem>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
+
+        <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
+(daemons).  This tool allows you to enable or disable certain processes.</para>
+
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="misc-params-hardware">
+    <info>
+      <title xml:id="misc-params-hardware-ti3">Hardware parameters</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
+
+        <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
+of keyboard.</para>
+
+        <note>
+          <para>If you notice a wrong keyboard layout and want to change it, keep in mind
+that your passwords are going to change too.</para>
+        </note>
+      </listitem>
+
+      <listitem>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
+
+        <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add or configure other pointing devices, tablets, trackballs
+etc.</para>
+      </listitem>
+
+      <listitem>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
+
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
+      </listitem>
+
+      <listitem>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
+
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
+
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
+    </itemizedlist>
+
+    <mediaobject>
+<imageobject> <imagedata format="PNG" xml:id="summaryBottom-im1"
+align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></mediaobject>
+  </section>
+
+  <section xml:id="misc-params-network">
+    <info>
+      <title xml:id="misc-params-network-ti4">Network and Internet parameters</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
+
+        <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
+repositories.</para>
+
+        <warning>
+          <para xml:id="misc-params-network-pa3" revision="1">When you add a network card, do not forget to set your firewall to monitor
+that interface as well.</para>
+        </warning>
+      </listitem>
+
+      <listitem>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
+
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
+
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="misc-params-security">
+    <info>
+      <title xml:id="misc-params-security-ti5">Амният</title>
+    </info>
+
+    <itemizedlist>
+      <listitem>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
+
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
+      </listitem>
+
+      <listitem>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
+
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
+
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
+
+        <warning>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
+        </warning>
+      </listitem>
+    </itemizedlist>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/reboot.xml b/docs/docs/stable/installer/tg/reboot.xml
new file mode 100644
index 00000000..a14e08f5
--- /dev/null
+++ b/docs/docs/stable/installer/tg/reboot.xml
@@ -0,0 +1,25 @@
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="tg" xml:id="reboot">
+  <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
+<info>
+    <title xml:id="reboot-ti1">Бозхудборшавӣ</title>
+  </info>
+  
+  
+  <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
+  <mediaobject condition="live">
+<imageobject> <imagedata format="PNG" xml:id="reboot-im1"
+fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/resizeFATChoose.xml b/docs/docs/stable/installer/tg/resizeFATChoose.xml
new file mode 100644
index 00000000..a23c22d2
--- /dev/null
+++ b/docs/docs/stable/installer/tg/resizeFATChoose.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section xmlns="http://docbook.org/ns/docbook"
+ xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+ xmlns:ns4="http://www.w3.org/2000/svg"
+ xmlns:ns3="http://www.w3.org/1999/xhtml"
+ xmlns:ns2="http://www.w3.org/1999/xlink"
+ xmlns:ns="http://docbook.org/ns/docbook"
+  version="5.0" xml:lang="tg" xml:id="resizeFATChoose">
+   
+  
+
+    
+
+  <info>
+    <!-- Made by marja on 2012 03 31 -->
+<!--2013-12-01 re-adding this file to software/i18n/tools/docs/installer/en
+  in git, in case the related screen gets restored in drakx-installer-stage2-->
+<title xml:id="resizeFATChoose-ti1">Resize <application>Windows<superscript>®</superscript></application>
+partition</title>
+  </info>
+
+  <para revision="1" xml:id="resizeFATChoose-pa1">You have more than one
+<application>Windows<superscript>®</superscript></application> partition.
+Choose which one should be made smaller to make space for installing
+<application>Mageia</application>.</para>
+
+  
+   
+<!--<para revision="1" xml:id="resizeFATChoose-pa2">
+.......</para>
+
+ <para revision="1" xml:id="resizeFATChoose-pa3">........</para>-->
+</section>
diff --git a/docs/docs/stable/installer/tg/securityLevel.xml b/docs/docs/stable/installer/tg/securityLevel.xml
new file mode 100644
index 00000000..2c210906
--- /dev/null
+++ b/docs/docs/stable/installer/tg/securityLevel.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="securityLevel-ti1">Сатҳи Амният</title>
+  </info>
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
+<!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
+
+  <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
+
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
+
+  <para><emphasis role="bold">Security Administrator</emphasis></para>
+
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
+send <emphasis>security alert messages</emphasis> when it detects situations
+which require notification to a system administrator.</para>
+
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
+
+  <note>
+    <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
+messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
+be configured for receiving such mail!</para>
+  </note>
+
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/tg/selectCountry.xml b/docs/docs/stable/installer/tg/selectCountry.xml
new file mode 100644
index 00000000..e1fd0ad9
--- /dev/null
+++ b/docs/docs/stable/installer/tg/selectCountry.xml
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="tg">
+  <info>
+    <title xml:id="selectCountry-ti1">Select your Country / Region</title>
+  </info>
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
+<imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
+align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+like the currency and wireless regulatory domain. Setting the wrong country
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
+
+  <note>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
+  </note>
+
+  <section xml:id="inputMethod">
+    <info>
+      <title xml:id="inputMethod-ti7">Input method</title>
+    </info>
+
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
+input method (at the bottom of the list). Input methods allow users to input
+multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
+default input method, so users should not need to configure it
+manually. Other input methods (SCIM, GCIN, HIME, etc) also provide similar
+functions and can be installed if you added HTTP/FTP media before package
+selection.</para>
+
+    <note>
+      <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
+    </note>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/selectInstallClass.xml b/docs/docs/stable/installer/tg/selectInstallClass.xml
new file mode 100644
index 00000000..66e7c86b
--- /dev/null
+++ b/docs/docs/stable/installer/tg/selectInstallClass.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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>
+    <!-- Made by marja on 2012 03 18 -->
+<!-- 20120405 updated JohnR -->
+<!-- enhanced xml code for screenshot, removed para xml:id's, changed "you'll" to
+      "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
+<!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
+<!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
+<title xml:id="selectInstallClass-ti1">Install or Upgrade</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para><emphasis role="bold">Install</emphasis></para>
+
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
+    </listitem>
+
+    <listitem>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
+
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
+    </listitem>
+  </itemizedlist>
+
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
+
+  <tip>
+    <para>If you have discovered that you forgot to select an additional language, you
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
+  </tip>
+</section>
diff --git a/docs/docs/stable/installer/tg/selectKeyboard.xml b/docs/docs/stable/installer/tg/selectKeyboard.xml
new file mode 100644
index 00000000..90855d47
--- /dev/null
+++ b/docs/docs/stable/installer/tg/selectKeyboard.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!-- Started by marja on 2012 03 31 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
+<title xml:id="selectKeyboard-ti1">Забонак</title>
+  </info>
+
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX selects an appropriate keyboard for your language. If no suitable
+keyboard is found it will default to a US keyboard layout.</para>
+
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
+</imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="selectKeyboard-pa2">Make sure that the selection is correct or choose another keyboard
+layout. If you don't know which layout your keyboard has, look in the
+specifications that came with your system, or ask the computer vendor. There
+may even be a label on the keyboard that identifies the layout. You can also
+look here: <link
+xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/Keyboard_layout</link></para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
+extra dialogue screen asking how you would prefer to switch between the
+Latin and non-Latin keyboard layouts</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/tg/selectKeyboardLive.xml b/docs/docs/stable/installer/tg/selectKeyboardLive.xml
new file mode 100644
index 00000000..9ae7a1a9
--- /dev/null
+++ b/docs/docs/stable/installer/tg/selectKeyboardLive.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/tg/selectLanguage.xml b/docs/docs/stable/installer/tg/selectLanguage.xml
new file mode 100644
index 00000000..e9e390cd
--- /dev/null
+++ b/docs/docs/stable/installer/tg/selectLanguage.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!-- Made by marja on 2012 04 01, using barjac's text -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- SimonNZG 2012-04-03 has had a look -->
+<!-- removed para id's, corrected duplicate id's for segments, corrected wrong
+       code in figure, marja, 20120409 -->
+<!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
+       up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
+<title xml:id="selectLanguage-ti1">Илтимос, барои истифода забонро интихоб кунед</title>
+  </info>
+
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
+
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
+
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
+extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
+
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <important condition="classical">
+    <para>Even if you choose more than one language, you must first choose one as your
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
+
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
+    </listitem>
+
+    <listitem>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
+    </listitem>
+
+    <listitem>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/tg/selectMouse.xml b/docs/docs/stable/installer/tg/selectMouse.xml
new file mode 100644
index 00000000..45b7cd4f
--- /dev/null
+++ b/docs/docs/stable/installer/tg/selectMouse.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="selectMouse-ti1">Select mouse</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Made by marja on 2012 04 11 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- adding some "real" text now that we know the page shows up in the right place-->
+<!-- marja 2012-04-24 adding screenshot -->
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="selectMouse-pa1">If you are not happy with how your mouse responds, you can select a
+different one here.</para>
+
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
+
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
+</section>
diff --git a/docs/docs/stable/installer/tg/setupBootloader.xml b/docs/docs/stable/installer/tg/setupBootloader.xml
new file mode 100644
index 00000000..8ac336f8
--- /dev/null
+++ b/docs/docs/stable/installer/tg/setupBootloader.xml
@@ -0,0 +1,198 @@
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="tg" xml:id="setupBootloader">
+  
+  
+  
+  
+  
+  
+  <info>
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
+Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
+  </info>
+  <section>
+    <title>Grub2</title>
+    <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
+      <listitem>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
+      </listitem>
+      <listitem>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
+      </listitem>
+    </itemizedlist>
+    <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
+      <listitem>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
+      </listitem>
+      <listitem>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
+    <section>
+      <title>Хосиятҳои асосии корандози худборшав</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+    <section>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
+        </listitem>
+      </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Using an existing bootloader</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Add or Modify a Boot Menu Entry</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
+    </section>
+  </section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/setupBootloaderAddEntry.xml b/docs/docs/stable/installer/tg/setupBootloaderAddEntry.xml
new file mode 100644
index 00000000..77b4756e
--- /dev/null
+++ b/docs/docs/stable/installer/tg/setupBootloaderAddEntry.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tg" xml:id="setupBootloaderAddEntry">
+  
+
+  <info>
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
+
+Lebarhon 2016 12 16 Updated for Mageia 6-->
+<title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
+  </info>
+
+  <para>To do this you need to manually edit /boot/grub2/custom.cfg or use the
+software <emphasis role="bold">grub-customizer</emphasis> tool instead
+(available in the Mageia repositories).</para>
+
+  <note>
+    <para>For more information, see: <link
+ns2:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+  </note>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/setupSCSI.xml b/docs/docs/stable/installer/tg/setupSCSI.xml
new file mode 100644
index 00000000..9efa3db6
--- /dev/null
+++ b/docs/docs/stable/installer/tg/setupSCSI.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="setupSCSI-ti1">Setup SCSI</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Made by marja on 2012 04 02 -->
+<!-- NEEDS TO BE REVIEWED! -->
+<!-- JohnR - edited 2012-03-03 -->
+<!-- SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) -->
+<!-- barjac has re-reviewed and made some minor tweaks. Revisions incremented. -->
+<!-- marja 2012-04-24 added screenshot -->
+<!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
+       Mdv doc instead of on our setupSCSI file -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
+
+  <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
+SCSI controllers it may be unable to determine the correct drivers to use
+and subsequently fail to recognise the drive.</para>
+
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/tg/software.xml b/docs/docs/stable/installer/tg/software.xml
new file mode 100644
index 00000000..b3f8db11
--- /dev/null
+++ b/docs/docs/stable/installer/tg/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="tg" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tg/soundConfig.xml b/docs/docs/stable/installer/tg/soundConfig.xml
new file mode 100644
index 00000000..042c65e5
--- /dev/null
+++ b/docs/docs/stable/installer/tg/soundConfig.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="soundConfig-ti1">Танзимкунии садо</title>
+  </info>
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
+
+  <section xml:id="soundConfig-Advanced">
+    <info>
+      <title xml:id="soundConfig-Advanced-ti1">Имконоти иловагӣ</title>
+    </info>
+
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/tg/takeOverHdConfirm.xml b/docs/docs/stable/installer/tg/takeOverHdConfirm.xml
new file mode 100644
index 00000000..b9dc26c2
--- /dev/null
+++ b/docs/docs/stable/installer/tg/takeOverHdConfirm.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <info>
+    <title xml:id="takeOverHdConfirm-ti1">Confirm hard disk to be formatted</title>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <mediaobject>
+<!-- Made by marja on 2012 04 03 -->
+<!-- test comment - johnr -->
+<!-- 2012-04-24 marja - replaced "if you are not sure you selected the correct
+    hard disk." with "if you are not sure about your choice", because I'm sure I
+    saw this help screen when I had only one HD -->
+<!-- 2013-05-05 marja added screenshot -->
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
+choice.</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/tg/testing.xml b/docs/docs/stable/installer/tg/testing.xml
new file mode 100644
index 00000000..f0e87793
--- /dev/null
+++ b/docs/docs/stable/installer/tg/testing.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="testing" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testing Mageia as Live system</title>
+  </info>
+
+  <section xml:id="testing-1">
+    <info>
+      <title xml:id="testing1-ti1">Live mode</title>
+    </info>
+
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
+    <mediaobject>
+<imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
+
+    <section>
+      <info>
+        <title xml:id="testing2-ti1">Testing hardware</title>
+      </info>
+
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>network interface: configure it with net_applet</para>
+        </listitem>
+
+        <listitem>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
+        </listitem>
+
+        <listitem>
+          <para>sound: a jingle has already been played</para>
+        </listitem>
+
+        <listitem>
+          <para>printer: configure your printer/s and print a test page</para>
+        </listitem>
+
+        <listitem>
+          <para>scanner: scan a document from ...</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
+
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
+    </section>
+
+    <section>
+      <info>
+        <title xml:id="testing3-ti1">Launch installation</title>
+      </info>
+
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="live-liveMode-install.png"/>
+</imageobject></mediaobject>
+    </section>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/tg/uninstall-Mageia.xml b/docs/docs/stable/installer/tg/uninstall-Mageia.xml
new file mode 100644
index 00000000..babcb347
--- /dev/null
+++ b/docs/docs/stable/installer/tg/uninstall-Mageia.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tg" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  <!--Lebarhon 2015-07-06 Not true with UEFI 
+Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
+<info>
+    <title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
+  </info>
+
+  
+
+  
+
+  <para>If Mageia didn't convince you or you can't install it correctly - in short
+you want get rid of it - that is your right and Mageia also gives you the
+possibility to uninstall. This is not true for every operating system.</para>
+
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
+
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
+
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
+
+  <para>If you have Vista or 7, you have one more possibility, you can extend the
+existing partition that is at the left of the freed space. There are other
+partitioning tools that can be used, such as <emphasis
+role="bold">gparted</emphasis>, available for both Windows and Linux. As
+always, when changing partitions, be very careful to back up anything
+important to you.</para>
+</section>
diff --git a/docs/docs/stable/installer/tg/unused.xml b/docs/docs/stable/installer/tg/unused.xml
new file mode 100644
index 00000000..43ca90e6
--- /dev/null
+++ b/docs/docs/stable/installer/tg/unused.xml
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="tg">
+  <info>
+    <title xml:id="unused-ti1">Keep or delete unused material</title>
+  </info>
+
+  
+
+  <mediaobject condition="live">
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
+
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
+
+  <mediaobject>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
+</imageobject></mediaobject>
+
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
+</section>
diff --git a/docs/docs/stable/installer/tr/DrakLive-cover.xml b/docs/docs/stable/installer/tr/DrakLive-cover.xml
index bafd0dd8..206ec7a2 100644
--- a/docs/docs/stable/installer/tr/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/tr/DrakLive-cover.xml
@@ -1,77 +1,105 @@
-<?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="tr" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="tr" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>ÇalışanCD ortamından kurulum</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Ocak 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>ÇalışanCD ortamından kurulum</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageia Resmi Belgeleri</para>
+      <para role="tagline">Mageia Resmi Belgeleri</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>Bu el kitabındaki ekran görüntüleri ve metinler CC BY-SA3.0 ile
+
+      <para>Bu el kitabındaki ekran görüntüleri ve metinler CC BY-SA3.0 ile
 lisanslanmıştır <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-            </para>
-            <para>Bu el kitabı, <link ns6:href="http://www.neodoc.biz">NeoDoc</link>
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Bu el kitabı, <link ns6:href="http://www.neodoc.biz">NeoDoc</link>
 tarafından geliştirilen <link ns6:href="http://www.calenco.com">Calenco
-CMS</link> yardımıyla hazırlanmıştır.
-            </para>
-            <para>Gönüllüler tarafından boş zamanlarında yazılmıştır. Bu el kitabının
+CMS</link> yardımıyla hazırlanmıştır.</para>
+
+      <para>Gönüllüler tarafından boş zamanlarında yazılmıştır. Bu el kitabının
 geliştirilmesine yardımcı olmak istiyorsanız lütfen <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Belgelendirme
-Ekibi</link> ile irtibat kurun.</para> 
+Ekibi</link> ile irtibat kurun.</para>
     </cover>
   </info>
+
   <article>
     <title>ÇalışanCD ortamından kurulum</title>
-       <para><note>
-          <para>Bu el kitabındaki kurulum aracı ekranlarının tümünü hiç kimse
+
+    <para><note>
+        <para>Bu el kitabındaki kurulum aracı ekranlarının tümünü hiç kimse
 görmeyecektir. Göreceğiniz ekranlar donanımınıza ve kurulum sırasındaki
 seçimlerinize bağlıdır.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/tr/DrakLive.xml b/docs/docs/stable/installer/tr/DrakLive.xml
index 66597c6a..7a6805bc 100644
--- a/docs/docs/stable/installer/tr/DrakLive.xml
+++ b/docs/docs/stable/installer/tr/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="tr" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="tr" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>ÇalışanCD ortamından kurulum</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>ÇalışanCD ortamından kurulum</title>
 
     <cover>
       <para><note>
@@ -17,10 +32,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 tarafından geliştirilen <link ns6:href="http://www.calenco.com">Calenco
 CMS</link> yardımıyla hazırlanmıştır.</para>
 
-      <para>Gönüllüler tarafından boş zamanlarında yazılmıştır. Bu el kitabının
-geliştirilmesine yardımcı olmak istiyorsanız lütfen <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">Belgelendirme
-Ekibi</link> ile irtibat kurun.</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>
 
@@ -40,7 +54,12 @@ Ekibi</link> ile irtibat kurun.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -50,17 +69,18 @@ Ekibi</link> ile irtibat kurun.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/tr/DrakX-cover.xml b/docs/docs/stable/installer/tr/DrakX-cover.xml
index f01a291d..9fd560b0 100644
--- a/docs/docs/stable/installer/tr/DrakX-cover.xml
+++ b/docs/docs/stable/installer/tr/DrakX-cover.xml
@@ -1,116 +1,155 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="tr" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="tr" xml:id="Quick-Startup"
+      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>DrakX ile kurulum</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>Şubat 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>Şubat 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageia Resmi Belgeleri</para>
+      <para role="tagline">Mageia Resmi Belgeleri</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>Bu el kitabındaki ekran görüntüleri ve metinler CC BY-SA3.0 ile
+
+      <para>Bu el kitabındaki ekran görüntüleri ve metinler CC BY-SA3.0 ile
 lisanslanmıştır <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
-	    </para>
-	    <para>Bu el kitabı, <link ns6:href="http://www.neodoc.biz">NeoDoc</link>
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Bu el kitabı, <link ns6:href="http://www.neodoc.biz">NeoDoc</link>
 tarafından geliştirilen <link ns6:href="http://www.calenco.com">Calenco
-CMS</link> yardımıyla hazırlanmıştır.
-	    </para>
-            <para>Gönüllüler tarafından boş zamanlarında yazılmıştır. Bu el kitabının
+CMS</link> yardımıyla hazırlanmıştır.</para>
+
+      <para>Gönüllüler tarafından boş zamanlarında yazılmıştır. Bu el kitabının
 geliştirilmesine yardımcı olmak istiyorsanız lütfen <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Belgelendirme
-Ekibi</link> ile irtibat kurun.</para> 
+Ekibi</link> ile irtibat kurun.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>DrakX ile kurulum</title>
-       <para><note>
-          <para>Bu el kitabındaki kurulum aracı ekranlarının tümünü hiç kimse
+
+    <para><note>
+        <para>Bu el kitabındaki kurulum aracı ekranlarının tümünü hiç kimse
 görmeyecektir. Göreceğiniz ekranlar donanımınıza ve kurulum sırasındaki
 seçimlerinize bağlıdır.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -118,29 +157,32 @@ seçimlerinize bağlıdır.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/tr/DrakX-inline.xml b/docs/docs/stable/installer/tr/DrakX-inline.xml
new file mode 100644
index 00000000..67f829f0
--- /dev/null
+++ b/docs/docs/stable/installer/tr/DrakX-inline.xml
@@ -0,0 +1,139 @@
+<?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="tr" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>DrakX ile kurulum</title>
+
+    <cover>
+      <para><note>
+          <para>Bu el kitabındaki kurulum aracı ekranlarının tümünü hiç kimse
+görmeyecektir. Göreceğiniz ekranlar donanımınıza ve kurulum sırasındaki
+seçimlerinize bağlıdır.</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">Bu el kitabındaki ekran görüntüleri ve metinler CC BY-SA3.0 ile
+lisanslanmıştır <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+
+      <para>Bu el kitabı, <link ns6:href="http://www.neodoc.biz">NeoDoc</link>
+tarafından geliştirilen <link ns6:href="http://www.calenco.com">Calenco
+CMS</link> yardımıyla hazırlanmıştır.</para>
+
+      <para>Gönüllüler tarafından boş zamanlarında yazılmıştır. Bu el kitabının
+geliştirilmesine yardımcı olmak istiyorsanız lütfen <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">Belgelendirme
+Ekibi</link> ile irtibat kurun.</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tr/DrakX.xml b/docs/docs/stable/installer/tr/DrakX.xml
index 3a2e4f73..36fe3fa8 100644
--- a/docs/docs/stable/installer/tr/DrakX.xml
+++ b/docs/docs/stable/installer/tr/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="tr" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="tr" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>DrakX ile kurulum</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>DrakX ile kurulum</title>
 
     <cover>
       <para><note>
@@ -35,18 +73,6 @@ Ekibi</link> ile irtibat kurun.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -61,23 +87,28 @@ Ekibi</link> ile irtibat kurun.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -87,7 +118,10 @@ Ekibi</link> ile irtibat kurun.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -95,19 +129,25 @@ Ekibi</link> ile irtibat kurun.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -115,11 +155,15 @@ Ekibi</link> ile irtibat kurun.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -138,4 +182,4 @@ Ekibi</link> ile irtibat kurun.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/tr/SelectAndUseISOs2.xml b/docs/docs/stable/installer/tr/SelectAndUseISOs2.xml
index 4d700c65..76d18be1 100644
--- a/docs/docs/stable/installer/tr/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/tr/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="tr" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">ISO'ları seçin ve kullanın</title>
   </info>
   <section>
     <title>Giriş</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
-    <para>There are two families of media:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: Booting with this media provides you with the maximum
-flexibility when choosing what to install, and for configuring your
-system. In particular, you have a choice of which Desktop environment to
-install</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: This option allows you to try out Mageia without having to
-actually install it, or make any changes to your computer.  If the
-installation is decided, the process is simpler, but you get fewer choices
-than offered by the Classical installer</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Ayrıntılar ilerleyen bölümlerde verilmiştir.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Ortam</title>
     <section>
       <title>Açıklama</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support (DVD, USB
-stick, ...) the ISO file is copied to.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
@@ -43,25 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>Ortak özellikler</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the Classical installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
             <para>They are used for performing clean installs or to upgrade a previously
-installed version of Mageia.</para>
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Karşılama ekranında Donanım Algılama, Sistem kurtarma ve Hafıza Testi
-araçları mevcuttur.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Her bir DVD birçok masaüstü ortamı ve dil içermektedir.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>Size, kurulum sırasında özgür olmayan yazılım eklemek için seçenek
-sunulacak.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -73,21 +107,19 @@ sunulacak.</para>
         <itemizedlist>
           <listitem>
             <para>Can be used to preview the Mageia operating system without having to install
-it. Can also be used to install Mageia if you wish.</para>
+it</para>
           </listitem>
           <listitem>
-            <para>Her bir ISO yalnız bir masaüstü ortamı içerir (Plasma, Gnome veya Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade previously installed Mageia
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Özgür olmayan yazılım içerirler.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -95,13 +127,13 @@ releases.</emphasis></para>
         <title>Canlı DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Yalnız Plasma masaüstü ortamı.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Sadece 64 bit mimari.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -109,13 +141,13 @@ releases.</emphasis></para>
         <title>Canlı DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>Yalnız GNOME masaüstü ortamı.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>Sadece 64 bit mimari</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -123,13 +155,13 @@ releases.</emphasis></para>
         <title>Canlı DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Yalnız Xfce masaüstü ortamı.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 veya 64 bit mimari.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -140,22 +172,10 @@ releases.</emphasis></para>
         <title>Ortak özellikler</title>
         <itemizedlist>
           <listitem>
-            <para>These are minimal ISO's containing no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient if
-bandwidth is too low to download a full DVD, or if you have a PC without a
-DVD drive or is unable to boot from a USB stick.</para>
-          </listitem>
-          <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>First steps are English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -163,8 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Özgür olmayan yazılım kullanmamayı tercih edenler için yalnızca özgür
-yazılım içerir.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -172,8 +192,7 @@ yazılım içerir.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>İhtiyacı olanlar için özgür olmayan yazılım (sürücüler, kodekler vs gibi)
-içerir.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -185,16 +204,23 @@ içerir.</para>
       <title>İndirme</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, you are provided with some information, such as
-the mirror in use and an option to switch if the bandwidth is too low. If
-http is chosen, you will also see something regarding checksums.</para>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the
-other, and copy the checksum <link linkend="integrity">for later
-use</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">İndirilen ortamın bütünlüğünü kontrol etme</title>
@@ -202,52 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
 algorithm from the file to be downloaded. You may compare the checksum of
 your downloaded ISO against that of the original source ISO. If the
 checksums do not match, it means that the actual data on the ISO's do not
-match, and if it is the case, then you should retry the download or attempt
-a repair using BitTorrent.</para>
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>To generate the checksum for your downloaded ISO, open a console, (no need
 to be root), and:</para>
       <itemizedlist>
         <listitem>
-          <para>To use md5sum, type: <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>To use sha1sum, type: <userinput>sha1sum
-path/to/the/image/file.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Example:</para>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>ISO yakma veya atma</title>
-    <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
-stick. This is not a standard copy operation as a bootable medium will
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
 actually be created.</para>
     <section>
       <title>Bir CD/DVD üzerine ISO yakma</title>
-      <para>Whichever software you use, ensure that the option to burn an <emphasis
-role="bold">image</emphasis> is used, burn <emphasis
-role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not
-correct. See <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link> for more information.</para>
     </section>
     <section>
       <title>Bir USB bellek üzerine ISO atmak</title>
-      <para>Tüm Mageia ISO'ları hibrittir, bunun anlamı şudur ki onları USB belleğe atıp
-sistemi önyükleme ve kurulum için kullanabilirsiniz.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any existing data will be lost and the partition capacity will
-be reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>Özgün kapasiteyi geri kazanmak için USB belleği yeniden bölümlendirmeli ve
-yeniden biçimlendirmelisiniz.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Mageia üzerinde bir grafiksel araç kullanarak</title>
         <para><link
@@ -260,7 +297,7 @@ gibi grafiksel bir araç kullanabilirsiniz.</para>
         <itemizedlist>
           <listitem>
             <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -269,7 +306,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Bir GNU/Linux sistem üzerinde komut satırını kullanarak</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk overwriting
 potentially valuable existing data if you specify the wrong target device.</para>
@@ -279,28 +316,27 @@ potentially valuable existing data if you specify the wrong target device.</para
             <para>Konsolu açın</para>
           </listitem>
           <listitem>
-            <para>Become a root (Administrator) user with the command <userinput>su
--</userinput> (don't forget the final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>USB belleği takın (bağlamayın, bu aynı zamanda herhangi bir uygulama veya
-belleğe erişecek,onu okuyacak dosya yöneticisinin açılmaması anlamına da
-gelmektedir)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para><userinput>fdisk -l</userinput> komutunu girin</para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
             <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
             <para>Alternatively, you can find the device name with the command
-<code>dmesg</code>: towards the end of this example, you can see the device
-name starting with <emphasis>sd</emphasis>, and in this case,
-<emphasis>sdd</emphasis> is the actual device. You can also see that its
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
 size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
@@ -322,21 +358,22 @@ size is 2GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: <emphasis role="bold"># <userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Where X=your device name eg: /dev/sdd</para>
-            <para>Example:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-and <emphasis role="bold">of</emphasis> stands for <emphasis
-role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Şu komutu girin: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>This is the end of the process, and you may now unplug your USB stick.</para>
@@ -345,4 +382,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tr/acceptLicense.xml b/docs/docs/stable/installer/tr/acceptLicense.xml
index 233a663d..6ee0a164 100644
--- a/docs/docs/stable/installer/tr/acceptLicense.xml
+++ b/docs/docs/stable/installer/tr/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">Lisans ve Sürüm Notları</title>
   </info>
 
@@ -46,18 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">Lisans Sözleşmesi</title>
     </info>
 
-    <para><application>Mageia</application> kurulumuna başlamadan önce lütfen lisans
-koşullarını dikkatle okuyun.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>Bu koşullar <application>Mageia</application> dağıtımının tamamına uygulanır
-ve devam edilmeden önce mutlaka kabul edilmelidir.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>Devam etmek için basitçe <guilabel>Onayla</guilabel> kutucuğunu seçin ve
-<guibutton>İleri</guibutton> düğmesine tıklayın.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>Bu koşulları reddetmeye karar verdiyseniz, incelediğiniz için teşekkür
-ederiz. <guibutton>Çık</guibutton> düğmesine tıklamak bilgisayarınızı
-yeniden başlatacaktır.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -75,7 +92,7 @@ Release Notes</para>
 
     
 
-    <para><application>Mageia</application>nın bu yayımı hakkındaki önemli bilgiler
-<guibutton>Sürüm Notları</guibutton> düğmesine tıklanarak görüntülenebilir.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tr/addUser.xml b/docs/docs/stable/installer/tr/addUser.xml
index 606692b9..fdd07719 100644
--- a/docs/docs/stable/installer/tr/addUser.xml
+++ b/docs/docs/stable/installer/tr/addUser.xml
@@ -1,35 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tr" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">Kullanıcı ve Süper Kullanıcı Yönetimi</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Yönetici (kök) Parolasını Ayarlayın:</title>
     </info>
 
-    <para>Tüm <application>Mageia</application> kurulumları için Linux' ta
-<emphasis>kök parolası</emphasis> olarak bilinen bir <emphasis
-role="bold">süper kullanıcı</emphasis> (yönetici) parolası belirlemeniz
-önerilir. Üstteki kutucuğa parolayı yazmaya başladığınızda kutucuktaki
-kalkan rengi, parolanızın gücü oranında kırmızıdan sarıya ve yeşile
-döner. Yeşil kalkan güçlü bir parola kullandığınızı gösterir. İlk parola
-kutucuğunun altındaki kutucuğa aynı parolayı yeniden girmelisiniz. Bu sayede
-ilk parolanın yanlış yazılmadığı denetlenir.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>Tüm parolalar büyük-küçük harfe duyarlıdır. Harflerin (büyük harf ve küçük
-harf), rakamların ve diğer karakterlerin bir parolada karışık kullanılması
-en iyisidir.</para>
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
+(upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
 
@@ -38,45 +55,46 @@ en iyisidir.</para>
       <title xml:id="enterUser-ti3">Bir kullanıcı girin</title>
     </info>
 
-    <para>Buraya bir kullanıcı ekleyin. Bir kullanıcı, <emphasis role="bold">süper
-kullanıcı</emphasis>dan (kök) daha az yetkiye sahiptir; ancak internette
-gezinmeye, ofis uygulamalarını kullanmaya veya oyunları oynamaya ve ortalama
-bir kullanıcının bilgisayarında yaptığı diğer her şeyi  yapmaya yetkisi
-olur.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Simge</guibutton>: bu düğmeye tıklarsanız kullanıcının simgesini
-değiştirebilirsiniz.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Gerçek Ad</guilabel>: Kullanıcının gerçek adını bu metin kutusuna
-girin.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Giriş Adı</guilabel>: Burada kullanıcının giriş adını
-belirleyebilir veya DrakX aracının, kullanıcının gerçek adının bir benzerini
-kullanmasına izin verebilirsiniz. <emphasis role="bold">Giriş adı
-büyük-küçük harfe duyarlıdır.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Şifre</guilabel>: Bu metin kutusuna kullanıcı parolası
-yazın. Metin kutusunun sonunda şifre gücünü gösteren bir kalkan
-vardır. (Ayrıca bkz: <xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Parola (tekrar)</guilabel>: Parolanızı yeniden yazın. Böylece
-DrakX üstte yazılan parola ile uyuşup uyuşmadığını denetler.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Mageia' yı kurarken eklediğiniz her kullanıcı için okuma ve yazma korumalı
-bir ev dizini oluşturulur (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
@@ -86,32 +104,31 @@ management</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">Gelişmiş Kullanıcı Yönetimi</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>The <guibutton>Advanced</guibutton> option allows you to edit further
-settings for the user you are adding.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
-<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis>
-and <emphasis role="bold">Sh</emphasis></para>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the <emphasis
-role="bold">user ID</emphasis> for any user you added in the previous
-screen. If you are unsure what the purpose of this is, then leave it blank.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/tr/add_supplemental_media.xml b/docs/docs/stable/installer/tr/add_supplemental_media.xml
index 4e3269ee..186a779b 100644
--- a/docs/docs/stable/installer/tr/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/tr/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="tr">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Veri Kaynağı Seçimi (Ek Kurulum Kaynağı Yapılandırın)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,43 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>Bu ekran size önceden tanımlanmış veri kaynaklarını gösterir. Paketler için
-optik disk veya uzak kaynak gibi başka kaynakları da
-ekleyebilirsiniz. Kaynak seçimi, ileriki aşamalarda hangi paketlerin
-erişilebilir olacağını belirler.</para>
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
+The source selection determines which packages will be available during the
+subsequent steps.</para>
 
   <para>Ağ kaynakları için takip edilecek iki adım vardır:</para>
 
   <orderedlist>
     <listitem>
-      <para>Henüz yapmadıysanız, ağ seçimi ve etkinleştirilmesi.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
-      <para>Bir yansı veya bir URL bağlantısı seçmek (ilk girdi). Bir yansı seçerek
-Mageia tarafından yönetilen tüm depolara, mesela <emphasis
-role="bold">Nonfree</emphasis>, <emphasis role="bold">Tainted</emphasis>
-veri kaynakları ile <emphasis role="bold">Updates</emphasis> deposuna,
-erişim sağlarsınız. URL bağlantısı ile ise, belirli bir veri kaynağını veya
-kendi NFS kurulumunuzu belirtirsiniz.</para>
+      <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
+mirror, you have access to the selection of all repositories managed by
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
+repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>32 bit paketleri de içeren bir 64 bit kurulumunu güncellemek istiyorsanız,
-buradaki Ağ protokollerinden birine tıklayarak çevrimiçi bir yansıyı eklemek
-üzere bu ekranı kullanmanız önerilir. 64-bit DVD ISO sadece 64-bit ve noarch
-paketlerini içerdiğinden 32-bit paketleri güncelleyemeyecektir. Ancak,
-çevrimiçi bir yansı ekledikten sonra kurulum aracı gereken 32-bit paketleri
-bulabilir.</para>
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
+packages, it is advised to use this screen to add an online mirror by
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tr/ask_mntpoint_s.xml b/docs/docs/stable/installer/tr/ask_mntpoint_s.xml
index 59bb4d57..b459e21d 100644
--- a/docs/docs/stable/installer/tr/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/tr/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="tr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">Bağlama noktasını seçin</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>Burada bilgisayarınızda bulunan sabit disk bölümlerini
-görebilirsiniz. <application>DrakX</application> önerilerini kullanmak
-istemiyorsanız bağlama noktalarını değiştirebilirsiniz.</para>
-
-  <note>
-    <para>If you change anything, make sure you still have a <emphasis
-role="bold"><literal>/</literal></emphasis> (root) partition.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis
-role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
-name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis>
-(for example, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>If you have several partitions, you can choose various different mount
-points from the drop down menu, such as <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis
-role="bold">/var</emphasis>. You can even make your own mount points, for
-instance <emphasis role="bold"><literal>/video</literal></emphasis> for a
-partition where you want to store your films, or <emphasis
-role="bold">/Data</emphasis> (or some other name) for your data.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -79,13 +82,17 @@ mount point field blank.</para>
   </itemizedlist>
 
   <warning>
-    <para>If you are not sure what to choose, click <emphasis
-role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
-disk partitioning</guilabel>, where, you can click on a partition to see its
-type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>Bağlama noktalarının doğru olduğundan eminseniz <guibutton>İleri</guibutton>
-düğmesine tıklayabilir ve DrakX tarafından önerilen disk bölümlerini
-biçimlendirmeyi veya daha fazlasını yapmayı seçebilirsiniz.</para>
-</section>
\ No newline at end of file
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/tr/bestTime.xml b/docs/docs/stable/installer/tr/bestTime.xml
index 4e416c56..af8a14e8 100644
--- a/docs/docs/stable/installer/tr/bestTime.xml
+++ b/docs/docs/stable/installer/tr/bestTime.xml
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="tr" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="tr" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Saat ayarları</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>Bu adımda, bilgisayar saatinizin yerel zaman veya UTC zamanına göre
-ayarlanmasını seçmelisiniz.</para>
-
-  <para>Gelişmiş sekmesinde saat ayarları ile ilgili daha fazla seçenek
-bulabilirsiniz.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tr/bootLive.xml b/docs/docs/stable/installer/tr/bootLive.xml
index d98da9f4..026dd8ea 100644
--- a/docs/docs/stable/installer/tr/bootLive.xml
+++ b/docs/docs/stable/installer/tr/bootLive.xml
@@ -1,30 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="tr"><info><title xml:id="bootLive-ti1">Mageia' yı ÇalışanCD Sistemi olarak başlatmak</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Kurulum ortamını başlatmak</title></info><section><info><title xml:id="bootLive11-ti1">Bir diskten</title></info><para>Kalıp dosyasını yazdırdığınız kurulum ortamından (CD-ROM, DVD-ROM... )
-doğrudan başlatabilirsiniz. Genellikle, bilgisayar yeniden başlatıldıktan
-sonra önyükleyicinin kurulumu kendiliğinden başlatması için ortamı CD/DVD
-sürücünüze takmanız yeterlidir. Bu şekilde kurulum başlamıyorsa BIOS
-ayarlarınızı yeniden yapmanız veya bilgisayarın hangi bileşenden
-başlatılacağını seçmek için önerilen bir tuşa basmanız gerekebilir.</para><para>Hangi donanıma sahip olduğunuz ve donanımın yapılandırmasına bağlı olarak ya
-aşağıdaki tek veya diğer iki ekranla karşılaşırsınız.</para></section><section><info><title xml:id="bootLive12-ti1">Bir USB aygıttan</title></info><para>ISO kalıbını yazdırdığınız USB aygıtından önyükleme yapabilirsiniz. BIOS
-ayarlarınıza göre bilgisayar belki doğrudan USB aygıtından başlatılır. Bu
-şekilde olmuyorsa BIOS ayarlarınızı yeniden yapmanız veya bilgisayarın hangi
-bileşenden başlatılacağını seçmek için önerilen bir tuşa basmanız
-gerekebilir.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">BIOS/CSM/Legacy kipinde</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>BIOS kipinde önyükleme yapılırken ilk ekran</para></caption></mediaobject><para>Orta menüde, üç eylem arasında seçim yapabilirsiniz:</para><itemizedlist><listitem><para>Mageia'yı Başlat: Mageia 5, sabit diske herhangi bir şey yazmadan bağlanan
-kurulum ortamından (CD/DVD veya USB bellek) başlatılır. Ancak, çok yavaş
-çalışan bir sistem ile karşılaşmayı bekleyin. Önyükleme tamamlandığında, bir
-sabit diske kurulum yapmaya başlayabilirsiniz.</para></listitem><listitem><para>Mageia'yı Kur: Bu seçenek Mageia'yı doğrudan sabit diske kuracaktır.</para></listitem><listitem><para>Sabit Diskten Başlat: Bu seçenek herhangi bir kurulum ortamı (CD/DVD veya
-USB bellek) takılı olmadığında, her zamaki gibi, sabit diskten önyüklemeye
-izin verir. (Mageia 5 ile çalışmamaktadır).</para></listitem></itemizedlist><para>Alt menüde Önyükleme Seçenekleri bulunmaktadır:</para><itemizedlist><listitem><para>F1 -Yardım. "splash", "apm", "acpi" ve "Ide" seçenekleini açıklar</para></listitem><listitem><para>F2 - Dil. Ekranlarda görüntülenecek dili seçin.</para></listitem><listitem><para>F3 - Ekran çözünürlüğü. Metin, 640x400, 800x600,1024x728 seçeneklerinden
-birini seçin</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom veya Diğeri. Normalde, kurulum takılı olan kurulum
-ortamından gerçekleştirilir. Burada, FTP vela NFS sunucuları gibi başka
-kaynakları seçebilirsiniz. Kurulum bir SLP sunucusundan yapılacaksa, bu
-seçeneği kullanarak sunucudaki erişilebilir kurulum kaynaklarından birini
-seçin.</para></listitem><listitem><para>F5 - Sürücü. Evet veya Hayır. Sistem, bir sürücü güncellemesi içeren tercihe
-bağlı bir diskin varlığını algılayabilir ve bunun kurulum sırasında
-takılmasını gerektirebilir.</para></listitem><listitem><para>F6 - Çekirdek seçenekleri. Bu şekilde donanımınıza ve kullandığınız
-sürücülere bağlı olarak çeşitli seçenekleri belirtebilirsiniz.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">UEFI kipinde</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>UEFI sistem diskten başlatılırken ilk ekran</para></caption></mediaobject><para>Sadece; Mageia' yı ÇalışanCD kipinde (ilk seçenek) çalıştırma veya kuruluma
-başlama (ikinci seçenek) seçeneklerini kullanabilirsiniz.</para><para>Bir USB bellekten başlattıysanız, önceki satırların tekrarı olan ancak "USB"
-ön eki bulunan iki ek satır daha görürsünüz. Bu ek satırlar arasından seçim
-yapmalısınız.</para><para>Her durumda, ilk adımları yani dil seçimi, saat dilimi ve klavye seçimi
-aynıdır. Sonrasında ise işlem <link linkend="testing">ÇalışanCD kipinde ek
-adımlar</link> ile farklılaşır.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Mageia' yı ÇalışanCD Sistemi olarak başlatmak</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Kurulum ortamını başlatmak</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">BIOS/CSM/Legacy kipinde</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>BIOS kipinde önyükleme yapılırken ilk ekran</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">UEFI kipinde</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/tr/chooseDesktop.xml b/docs/docs/stable/installer/tr/chooseDesktop.xml
index 180498a4..fa5d4a97 100644
--- a/docs/docs/stable/installer/tr/chooseDesktop.xml
+++ b/docs/docs/stable/installer/tr/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tr" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">Masaüstü Seçimi</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">Masaüstü Seçimi</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide-show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> or <application>GNOME</application>
-desktop environment. Both come with a full set of useful applications and
-tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
-use both), or if you want to modify the default software choices for these
-desktop environments. The <application>LXDE</application> desktop, for
-instance, is lighter than the previous two, sporting less eye candy and
-fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/tr/choosePackageGroups.xml b/docs/docs/stable/installer/tr/choosePackageGroups.xml
index 0c2274fa..831a9b08 100644
--- a/docs/docs/stable/installer/tr/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/tr/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tr" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tr" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">Paket Grubu Seçimi</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/tr/choosePackagesTree.xml b/docs/docs/stable/installer/tr/choosePackagesTree.xml
index d2ab7ef4..17469a66 100644
--- a/docs/docs/stable/installer/tr/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/tr/choosePackagesTree.xml
@@ -1,20 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="tr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="tr">
   <info>
     <title xml:id="choosePackagesTree-ti1">Paketleri Tek Tek Seçin</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject><imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/></imageobject></mediaobject>
 
   <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-  <para>Seçiminizi yaptıktan sonra, paket seçiminizi (bir USB belleğe de olabilir)
-kaydetmek için sayfanın en altındaki <guibutton>disket simgesine</guibutton>
-tıklayabilirsiniz. Bu dosyayı kurulum esnasında aynı düğmeye tıklayarak ve
-yüklemeyi seçerek, aynı paketleri bir başka bilgisayarda da kurabilirsiniz.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tr/configureServices.xml b/docs/docs/stable/installer/tr/configureServices.xml
index 386b4a68..33256d08 100644
--- a/docs/docs/stable/installer/tr/configureServices.xml
+++ b/docs/docs/stable/installer/tr/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tr" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="tr" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Hizmetleri Yapılandırma</title>
   </info>
@@ -7,20 +7,31 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose are usually good.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">Bir hizmeti vurgularsanız, o hizmet hakkındaki bilgi alttaki kutuda
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">Bir hizmeti vurgularsanız, o hizmet hakkındaki bilgi alttaki kutuda
 görüntülenir.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Ne yaptığınızı çok ama çok iyi bir şekilde biliyorsanız burada bir şeyleri
 değiştirin.</para>
diff --git a/docs/docs/stable/installer/tr/configureTimezoneUTC.xml b/docs/docs/stable/installer/tr/configureTimezoneUTC.xml
index d2be86f4..1d0be828 100644
--- a/docs/docs/stable/installer/tr/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/tr/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="tr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="tr">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Zaman Dilimini Yapılandırma</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the
-same time-zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
 or to GMT, also known as UTC.</para>
diff --git a/docs/docs/stable/installer/tr/configureX_card_list.xml b/docs/docs/stable/installer/tr/configureX_card_list.xml
index 4f349dbb..2177618b 100644
--- a/docs/docs/stable/installer/tr/configureX_card_list.xml
+++ b/docs/docs/stable/installer/tr/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="tr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Bir X Sunucusu Seçme (Ekran Kartını Yapılandırma)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX; ekran kartlarının karşılaştırmalı veritabanına sahip olup genellikle
 ekran kartınızı doğru olarak tanımlar.</para>
@@ -29,33 +42,34 @@ ekran kartınızı doğru olarak tanımlar.</para>
   <para>Kurulum aracı ekran kartınızı doğru olarak algılayamamışsa ve kartınızın
 hangisi olduğunu biliyorsanız, kartınızı ağaçtan şuna göre seçebilirsiniz: <itemizedlist>
       <listitem>
-        <para>üretici</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>sonra kartınızın ismi</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>ve kartınızın türü</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-<emphasis role="bold">Xorg</emphasis> category, which provides more than 40
-generic and open source video card drivers. If you still can't find a
-specific driver for your card there is the option of using the <emphasis
-role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the <emphasis role="bold">Command-line</emphasis> Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the <emphasis role="bold">Nonfree</emphasis>
-repository and in some cases only from the card manufacturers' websites.</para>
-
-  <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be
-explicitly enabled to access them. If you didn't enable it previously, you
-should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/tr/configureX_chooser.xml b/docs/docs/stable/installer/tr/configureX_chooser.xml
index 872e8320..e60843f5 100644
--- a/docs/docs/stable/installer/tr/configureX_chooser.xml
+++ b/docs/docs/stable/installer/tr/configureX_chooser.xml
@@ -1,62 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="tr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Ekran Kartı ve Monitör Yapılandırma</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym> or any other graphical environment to work well, the
-following <acronym>X</acronym> settings need to be correct. Choose the
-correct settings if none are shown, or if you think the details are
-incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Ekran kartı</guibutton></emphasis>: Gerek duyarsanız
-listeden kartınızı seçin.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from
-the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose
-<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and
-vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Yanlış tazeleme oranları monitörünüze zarar verebilir</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and
-color depth of your monitor can be set here.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the option is there, and you test your
-settings, you should be ask whether your settings are correct. If you answer
-<emphasis role="bold">yes</emphasis>, the settings will be kept. If you
-don't see anything, you'll return to the configuration screen and be able to
-reconfigure everything until the test result is satisfactory. If the test
-option is not available, then make sure your settings are on the safe side.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Seçenekler</guibutton></emphasis>: Buradan bir çok
-seçeneği etkinleştirebilir veya devre dışı bırakabilirsiniz.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/tr/configureX_monitor.xml b/docs/docs/stable/installer/tr/configureX_monitor.xml
index b25f24ff..c1d51129 100644
--- a/docs/docs/stable/installer/tr/configureX_monitor.xml
+++ b/docs/docs/stable/installer/tr/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="tr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,65 +23,83 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Monitör Seçimi</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX monitörlerin karşılaştırmalı veritabanına sahip olup genellikle
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX monitörlerin karşılaştırmalı veritabanına sahip olup genellikle
 monitörünüzü doğru olarak tanımlar.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
 could damage your monitor or video hardware. Please don't try something
 without knowing what you are doing.</emphasis> If in doubt you should
 consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Kişisel</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">Bu seçenek iki kritik parametreyi ayarlamanızı sağlar, dikey tazeleme oranı
-ve yatay tazeleme oranı. Dikey tazeleme oranı ekranın hangi sıklıkta
-tazeleneceğini belirler ve yatay ekran aralığı, hangi tarama hatlarının
-hangi oranda görüntüleneceğini belirler.</para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">Monitörünüzün kapasitesinin ötesinde bir monitör türü ve ekran aralığı
+        <para revision="1" xml:id="configureX_monitor-pa4">Monitörünüzün kapasitesinin ötesinde bir monitör türü ve ekran aralığı
 belirlememeniz <emphasis>ÇOK ÖNEMLİDİR</emphasis>: monitörünüze zarar
 verebilirsiniz. Kararsız kalırsanız, ortalama bir ayar seçin ve
 monitörünüzün kılavuzuna bakın.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Tak ve Kullan</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">Öntanımlı seçenek budur. Monitör veritabanından monitör türünü bulmaya
-çalışır.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Üretici</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">Kurulum aracı monitörünüzü doğru olarak algılayamamışsa ve monitörünüzün
-hangisi olduğunu biliyorsanız, monitörünüzü ağaçtan şuna göre
-seçebilirsiniz: <itemizedlist>
       <listitem>
-        <para>üretici</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>monitör üreticisinin adı</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>monitör açıklaması</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">Kurulum aracı monitörünüzü doğru olarak algılayamamışsa ve monitörünüzün
+hangisi olduğunu biliyorsanız, monitörünüzü ağaçtan şuna göre
+seçebilirsiniz:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Genel</emphasis></para>
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the <emphasis
-role="bold">Vesa</emphasis> card driver when your video hardware cannot be
-determined automatically. Once again it may be wise to be conservative in
-your selections.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
+
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/tr/diskPartitioning.xml b/docs/docs/stable/installer/tr/diskPartitioning.xml
new file mode 100644
index 00000000..002c86be
--- /dev/null
+++ b/docs/docs/stable/installer/tr/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="tr" version="5.0" xml:lang="tr">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tr/diskdrake.xml b/docs/docs/stable/installer/tr/diskdrake.xml
index 7a40fac6..c77d9d87 100644
--- a/docs/docs/stable/installer/tr/diskdrake.xml
+++ b/docs/docs/stable/installer/tr/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tr" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">DiskDrake ile kişisel disk bölümlendirme</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis>
-partition you must ensure that you have a separate <emphasis
-role="bold">/boot</emphasis> partition. The encryption option for the
-<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise
-your system will be unbootable.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view their details before you start.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage
-device like a USB key). In the screen-shot above there are two available
-devices: <emphasis role="bold">sda </emphasis>and <emphasis
-role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if
-you are sure you want to wipe all partitions on the selected storage device.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Expert mode</guibutton> provides more options such as a label
-(give a name to) a partition, or to choose a partition type.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Hazır olunca <guibutton>Bitti</guibutton>' yi tıklayın.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
-Partition) is present and correctly mounted on /boot/EFI (see below)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>Mageia' yı  Eski/GPT bir sisteme kuruyorsanız doğru türde bir BIOS disk
-bölümünün mevcut olduğunu denetleyin</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/tr/doPartitionDisks.xml b/docs/docs/stable/installer/tr/doPartitionDisks.xml
index 7e01b3ee..1462ab15 100644
--- a/docs/docs/stable/installer/tr/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/tr/doPartitionDisks.xml
@@ -1,170 +1,212 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tr" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">Bölümlendirme</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the
-DrakX partitioning proposals for where to install
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the
-layout and content of your particular hard drive(s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Mevcut Disk Bölümü Kullanılsın</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">Bu seçenek erişilebilir durumdaysa Linux uyumlu önceden mevcut olan disk
+      <para revision="1" xml:id="doPartitionDisks-pa5">Bu seçenek erişilebilir durumdaysa Linux uyumlu önceden mevcut olan disk
 bölümleri bulunmuştur ve yükleme için kullanılabilir.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Boş Alan Kullanılsın</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">Sabit diskinizde kullanılmayan boş alan varsa, yeni Mageia kurulumunuz için
+      <para revision="1" xml:id="doPartitionDisks-pa7">Sabit diskinizde kullanılmayan boş alan varsa, yeni Mageia kurulumunuz için
 bu seçenek o alanı kullanacaktır.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Windows Bölümündeki Boş Alan Kullanılsın</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">Mevcut bir Windows bölümünde kullanılmayan alan varsa, kurulum aracı bunu
-kullanmayı önerebilir.</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">Bu, yeni Mageia kurulumunuz için boş alan açmakta faydalı olabilir; ancak
-riskli bir işlem olduğundan önemli tüm dosyalarınızı yedeklemelisiniz!</para>
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
 
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
+
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Bu işlemin Windows bölümünün boyutunu azaltacağını unutmayın. Disk bölümü
 "temiz" olmalıdır; yani son kullanımında Windows düzgün şekilde kapatılmış
 olmalıdır. Bölümdeki tüm dosyaların kullanılacak alanın dışına taşındığına
 dair garanti sunmazsa da ayrıca mutlaka disk birleştirme
 yapılmalıdır. Kişisel dosyalarınızı yedeklemeniz önerilir.</para>
+      </important>
+    </listitem>
 
-        <para>With this option, the installer displays the remaining Windows partition in
-light blue and the proposed Mageia partition in dark blue with their
-intended sizes just underneath. You have the option to modify these sizes by
-clicking and dragging the gap between both partitions. See the following
-screen-shot.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Tüm Diski Sil ve Kullan</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">This option will allocate the entire drive for Mageia.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Önemli! Bu işlem seçilen sabit diskteki BÜTÜN veriyi silecektir. Dikkatli
-olun!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">Bu seçenek, sistemi sabit disklerinize kurarken size tam denetim sağlar..</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">Sabit diskin bir kısmını başka bir şey için kullanmak niyetindeyseniz veya
-disk üzerinde kaybetmeye henüz hazır olmadığınız verileriniz varsa bu
-seçeneği kullanmayın.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Özel Disk Bölümlendirme</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">Bu seçenek, sistemi sabit disklerinize kurarken size tam denetim sağlar..</para>
-      </listitem>
-    </itemizedlist></para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Disk bölümü boyutlandırma:</emphasis></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para>If you are not using the <emphasis role="bold">Custom disk
-partitioning</emphasis> option, the installer will allocate the available
-space according to the following rules:</para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>If the total available space is less than 50 GB, then only one partition is
-created. This will be the <emphasis role="bold">/</emphasis> (root)
-partition.</para>
-      </listitem>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-      <listitem>
-        <para>If the total available space is greater than 50 GB, then three partitions
-are created</para>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 of the total available place is allocated to <emphasis
-role="bold">/</emphasis> with a maximum of 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 kadarı en fazla 4 GB olacak şekilde takas olarak ayarlanır</para>
-          </listitem>
-
-          <listitem>
-            <para>the rest (at least 12/19) is allocated to <emphasis
-role="bold">/home.</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-  <para>That means that from 160 GB or greater available space, the installer will
-create three partitions: 50 GB for <emphasis role="bold">/</emphasis>, 4 GB
-for <emphasis role="bold">swap</emphasis> and the remainder for <emphasis
-role="bold">/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
-automatically detected - or created if it does not exist yet, and mounted on
-/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to
-create a BIOS boot partition if not already existing. It is a roughly 1 MiB
-partition with no mount point. Choose <xref linkend="diskdrake"/> to be able
-to create it with the Installer like any other partition, just select BIOS
-boot partition as the filesystem type.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512. Due to lack of available hardware, the
 partitioning tool used in the installer has not been tested with such a
-drive. Also some SSD devices now use an erase block size over 1 MB. If you
-have such a device we suggest that you partition the drive in advance, using
-an alternative partitioning tool like <emphasis
-role="bold">gparted</emphasis>, and to use the following settings:</para>
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/tr/exitInstall.xml b/docs/docs/stable/installer/tr/exitInstall.xml
index 3800f7df..310b2cbf 100644
--- a/docs/docs/stable/installer/tr/exitInstall.xml
+++ b/docs/docs/stable/installer/tr/exitInstall.xml
@@ -5,23 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2"><application>Mageia</application> kurulumunu ve yapılandırmasını
-bitirdiniz. Şimdi güvenle kurulum ortamını çıkartarak bilgisayarınızı
-yeniden başlatabilirsiniz.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems (if there are more than one) on your computer.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">Önyükleyici ayarlarını yapmadıysanız, Mageia kurulumunuz kendiliğinden
 seçilecek ve başlatılacaktır.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Tadını çıkarın!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Herhangi bir sorunuz varsa veya Mageia' ya katkıda bulunmak istiyorsanız
-www.mageia.org adresini ziyaret edin</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tr/firewall.xml b/docs/docs/stable/installer/tr/firewall.xml
index 8e80a74e..1d1fc660 100644
--- a/docs/docs/stable/installer/tr/firewall.xml
+++ b/docs/docs/stable/installer/tr/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="tr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="tr" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Güvenlik duvarı</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Güvenlik duvarı</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
   <para>In the default setting (no button is checked), no service of the system is
-accessible from the network. The <emphasis role="bold">Everything (no
-firewall)</emphasis> enables access to all services of the machine - an
-option that does not make much sense in the context of the installer since
-it would create a totally unprotected system. Its veritable use is in the
-context of the Mageia Control Center (which uses the same GUI layout) for
-temporarily disabling the entire set of firewall rules for testing and
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
 debugging purposes.</para>
 
   <para>All other options are more or less self-explanatory. As an example, you will
-enable the <emphasis role="bold">CUPS server</emphasis> if you want printers
-on your machine to be accessible from the network.</para>
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Gelişmiş</emphasis></para>
 
-  <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where
-you can enable a series of services by typing a list of couples (blank
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
   <para><emphasis>&lt;port-numarasır>/&lt;protokol></emphasis></para>
diff --git a/docs/docs/stable/installer/tr/formatPartitions.xml b/docs/docs/stable/installer/tr/formatPartitions.xml
index 9fc47164..5c945069 100644
--- a/docs/docs/stable/installer/tr/formatPartitions.xml
+++ b/docs/docs/stable/installer/tr/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="tr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Biçimlendirme</title>
   </info>
@@ -11,32 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
 partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Genellikle, DrakX tarafından seçilen bölümlerin biçimlendirilmesi gerekir</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1"><emphasis>hatalı bloklar</emphasis> için sınanmasını istediğiniz bölümleri
-seçmek için <guibutton>Gelişmiş</guibutton> düğmesine tıklayın</para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen,
-where you can choose to view details of your partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">Seçimi hakkında emin olduğunuzda devam etmek için
-<guibutton>İleri</guibutton> düğmesini tıklayın.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/tr/graphicalConfiguration.xml b/docs/docs/stable/installer/tr/graphicalConfiguration.xml
new file mode 100644
index 00000000..8eaac1cf
--- /dev/null
+++ b/docs/docs/stable/installer/tr/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/tr/installUpdates.xml b/docs/docs/stable/installer/tr/installUpdates.xml
index 60fa7fea..7c577329 100644
--- a/docs/docs/stable/installer/tr/installUpdates.xml
+++ b/docs/docs/stable/installer/tr/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="tr">
-  <info>
-    <title xml:id="installUpdates-ti1">Güncellemeler</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">Güncellemeler</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1"><application>Mageia</application>nın bu sürümü yayımlandığından beri bazı
-paketler güncellenmiş veya geliştirilmiş olabilir.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them,
-select <guilabel>No</guilabel> if you don't want to do this now, or if you
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
 aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Press <guibutton>Next</guibutton> to continue</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tr/installer.xml b/docs/docs/stable/installer/tr/installer.xml
index 7a08c576..c40d8450 100644
--- a/docs/docs/stable/installer/tr/installer.xml
+++ b/docs/docs/stable/installer/tr/installer.xml
@@ -6,166 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, Mageia Kurulum Aracı</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, Mageia Kurulum Aracı</title>
   </info>
 
   <para>İster GNU/Linux ile yeni tanışan isterse deneyimli bir kullanıcı olun,
 Mageia kurulum aracı kurulumu veya yükseltmeyi mümkün olan en kolay şekilde
 yapmanıza yardımcı olmak için tasarlanmıştır.</para>
 
-  <para>İlk menü ekranı bir çok seçeneğe sahiptir; fakat öntanımlı olan, normalde
-tüm ihtiyacınızı karşılayacak, kurulum aracını başlatacaktır.</para>
+  <section>
+    <title>Kurulum adımları</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Kurulum Karşılama Ekranı</title>
 
-    <section>
-      <title>Bir Mageia DVD kullanarak</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>From this screen, you have access to options by pressing "<emphasis
-role="bold">e</emphasis>" to enter the edit mode. To come back to this
-screen, press either <emphasis role="bold">Esc</emphasis> key to quit
-without saving or press the key <emphasis role="bold">Ctrl</emphasis> or
-<emphasis role="bold">F10</emphasis> to quit with saving.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, it is possible to set some preferences (note that the
-options <emphasis role="bold">F1</emphasis> to <emphasis
-role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist>
-          <listitem>
-            <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis
-role="bold">F6</emphasis> options, you can view relevant help by pressing
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a
-specific language for the installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>If needed, change the screen resolution by pressing <emphasis
-role="bold">F3</emphasis> (Legacy mode only).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis role="bold">F6</emphasis> <emphasis
-role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis
-role="bold">e</emphasis> instead).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Default: It doesn't alter anything in the default options.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: Priority is given to the safer options at the price of a
-performance detriment.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI: (Advanced Configuration and Power Interface): Power management
-features are not used.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU
-interrupt. Select this option if you experience system misbehaviour like a
-kernel panic in relation to APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>Bu girdilerden birini seçerseniz, seçtiğiniz girdi <guilabel>Önyükleme
-Seçenekleri</guilabel> satırında görüntülenen öntanımlı seçenekleri
-değiştirir.</para>
-
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with
-<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot
-Options</guilabel> line, despite this, they will in fact be applied.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various
-boot options. Select an item with the arrow keys and press <emphasis
-role="bold">Enter</emphasis> for more details or press <emphasis
-role="bold">Esc</emphasis> to go back to the welcome screen.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>The detailed view about the splash option. Press <emphasis
-role="bold">Esc</emphasis> or select <guilabel>Return to Boot
-Options</guilabel> to go back to the options list. These options can be
-added by hand in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>Eski ve UEFI sistemlerde çekirdek seçenekleri ile ilgili daha fazla bilgi
-için: <link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>Kurulum adımları</title>
+    <section>
+      <title>UEFI Systems</title>
 
-    <para>The install process is divided into a number of steps, the status of which
-is indicated in a panel to the left of the screen.</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
-options.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
-about the particular step.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
-is possible to reboot, but please think twice before you do this. Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -176,19 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>İlk ekrandan sonra dil seçimi ekranına erişemediniz. Bu durum bazı ekran
-kartlarında ve eski sistemlerde ortaya çıkabilir. Komut satırında
-<code>vgalo</code> yazarak düşük çözünürlük kullanmayı deneyin.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this press <emphasis role="bold">Esc</emphasis> at the first welcome screen
-and confirm with <emphasis role="bold">ENTER</emphasis>. You will be
-presented with a black screen with the word "boot:". Type "text" and press
-<emphasis role="bold">ENTER</emphasis> to continue with the installation in
-text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -196,11 +195,11 @@ text mode.</para>
     <section>
       <title>Kurulum Donuyor</title>
 
-      <para>Kurulum sırasında sistem donmuş ise donanım algılaması işleminde bir
-sorundan kaynaklanabilir. Bu durumda donanımın kendiliğinden algılanması
-işlemi atlanabilir ve sonraya bırakılabilir. Bunu denemek için komut
-satırında <code>noauto</code> yazın. Bu seçenek gerekli olduğunda diğer
-seçeneklerle birlikte kullanılabilir.</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -208,17 +207,18 @@ seçeneklerle birlikte kullanılabilir.</para>
 
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dinamik bölümler</title>
 
-      <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis>
-format to <emphasis role="bold">dynamic</emphasis> format in Microsoft
-Windows, then it is not possible to install Mageia on this disc. To revert
-to a basic disk, see the Microsoft documentation: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/tr/locale.xml b/docs/docs/stable/installer/tr/locale.xml
new file mode 100644
index 00000000..8c016367
--- /dev/null
+++ b/docs/docs/stable/installer/tr/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/tr/login.xml b/docs/docs/stable/installer/tr/login.xml
index 4cbc1b35..d63326aa 100644
--- a/docs/docs/stable/installer/tr/login.xml
+++ b/docs/docs/stable/installer/tr/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="tr"><info><title xml:id="label-to-adapt-ti1">Giriş Ekranı</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM giriş ekranı</para></caption></mediaobject><para>Son olarak, giriş ekranına geleceksiniz.</para><para>Kullanıcı adınızı ve parolanızı girin. Birkaç saniye içinde kendinizi hangi
-kurulum ortamı kullandığınıza bağlı olarak KDE veya GNOME masaüstünde
-bulacaksınız. Artık, Mageia kurulumunuza başlayabilirsiniz.</para><para>Belgelendirmemizin diğer kısımlarına <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">Mageia
-Wiki</link> sayfasında bulabilirsiniz.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="tr">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tr/media_selection.xml b/docs/docs/stable/installer/tr/media_selection.xml
index 9c041073..36fecf0b 100644
--- a/docs/docs/stable/installer/tr/media_selection.xml
+++ b/docs/docs/stable/installer/tr/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="tr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Veri Kaynağı Seçimi (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Burada mevcut depoların listesi vardır. Kurulum için kullandığınız veri
 kaynağına göre bütün depolar erişilebilir değildir. Depo seçimi, ilerleyen
@@ -31,11 +40,11 @@ temel paketlerini içerir.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis>Nonfree</emphasis> deposu, ücretsiz edinilebilen paketleri
-içerir. Mageia bunları sunabilir fakat (Nonfree isminden de anlaşılabileceği
-gibi) kapalı kaynak kodlu yazılımları içerir. Örneğin bu depo nVidia ve ATI
-ekran kartlarının müseccel sürücülerini, birçok kablosuz kart v.b. için
-donanım yazılımlarını içerir.</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/tr/minimal-install.xml b/docs/docs/stable/installer/tr/minimal-install.xml
index 2ff5665c..64ba2828 100644
--- a/docs/docs/stable/installer/tr/minimal-install.xml
+++ b/docs/docs/stable/installer/tr/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="tr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="tr">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">En Ufak Kurulum</title>
   </info>
@@ -10,29 +13,44 @@
 
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
-  <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+  
 
-  <para>Minimal Installation is intended for those with specific uses in mind for
-<application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the <emphasis
-role="bold">Individual package selection</emphasis> option mentioned above,
-to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>If you choose this installation method, then the relevant screen will offer
-you a few useful extras to install, such as documentation and X.</para>
+  
 
-  <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
 lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para>Temel belgelendirme man ve info sayfaları şeklinde sunulmuştur.  <link
-xlink:href="http://www.tldp.org/manpages/man.html">Linux Belgelendirme
-Projesi</link> man sayfaları ve <link
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
+xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
+Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
-coreutils</link> info sayfalarını içermektedir.</para>
+coreutils</link> info pages.</para>
 
   <mediaobject>
 <imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
diff --git a/docs/docs/stable/installer/tr/misc-params.xml b/docs/docs/stable/installer/tr/misc-params.xml
index 6320c043..f5e88e03 100644
--- a/docs/docs/stable/installer/tr/misc-params.xml
+++ b/docs/docs/stable/installer/tr/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tr" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Çeşitli parametrelerin özeti</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
 
   <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
 the choices you made and on the hardware detected. You can check the
 settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>As a general rule, it is recommended that you accept the default settings
@@ -26,7 +42,7 @@ unless:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>some other factor mentionned in the detailed sections below is an issue.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,46 +54,47 @@ unless:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Zaman Dilimi</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
 can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Ülke / Bölge</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
 setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Önyükleyici</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX önyükleyici ayarı için iyi seçimler yaptı.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">Daha fazla bilgi için bakınız: <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>Kullanıcı yönetimi</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">İlave kullanıcıları buraya ekleyebilirsiniz. Bu kullanıcılar kendi
-<literal>/home</literal> dizinlerine sahip olacaklardır.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Hizmetler</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
 (daemons).  This tool allows you to enable or disable certain processes.</para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">Burada bir şeyi değiştirmeden önce dikkatle denetlemelisiniz; çünkü bir hata
-bilgisayarınızın düzgün işlemesini engelleyebilir.</para>
-
-        <para>Daha fazla bilgi için bakınız: <xref linkend="configureServices"/></para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -89,7 +106,7 @@ bilgisayarınızın düzgün işlemesini engelleyebilir.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Klavye</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
 of keyboard.</para>
@@ -101,28 +118,32 @@ parolanızın da değişeceğini unutmayın.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Fare</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Burada diğer işaretleme araçlarını, tabletleri, iztoplarını
 v.b. ayarlayabilirsiniz.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Ses kartı</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The
-option to select a different driver is only given when there is more than
-one driver for your card, but where none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Grafiksel arabirim</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">Bu bölüm ekran kart(lar)ınızı ve görüntüleme araçlarınızı
-ayarlayabilirsiniz.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">Daha fazla bilgi için bakınız: <xref linkend="configureX_chooser"/></para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -137,11 +158,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Ağ</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, using the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
@@ -151,14 +172,14 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Vekil Sunucular</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">Bir Vekil Sunucu, bilgisayarınız ve daha geniş İnternet arasında aracı
-görevi görür.  Bu bölüm, bir vekil sunucu hizmetini kullanmak için
-bilgisayarınızı yapılandırmanıza olanak sağlar.</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -170,27 +191,31 @@ need to enter here.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Güvenlik Düzeyi</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Burada bilgisayarınız için Güvenlik düzeyini ayarlayabilirsiniz. Çoğu
-durumda öntanımlı ayar (Standart) genel kullanım için yeterlidir.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Kullanımınız için en uygun seçeneği işaretleyin.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Güvenlik Duvarı</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">Güvenlik Duvarı, önemli verileriniz ile internette dolaşan ve bu verileri
-çalmaya uğraşan çakallar arasında duvar oluşturmaktadır.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Sisteminize erişiminin olmasını istediğiniz hizmetleri seçin. Seçimleriniz
-bilgisayarınızın kullanım biçimine bağlı olacaktır. Ayrıntılı bilgi için
-<xref linkend="firewall"/> kısmına bakın.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Her şeye izin vermenin (güvenlik duvarı yok) çok riskli olabileceğini
-unutmayın.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/tr/reboot.xml b/docs/docs/stable/installer/tr/reboot.xml
index e256c3c0..ad0ce86e 100644
--- a/docs/docs/stable/installer/tr/reboot.xml
+++ b/docs/docs/stable/installer/tr/reboot.xml
@@ -1,19 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="tr" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">Yeniden Başlat</title>
   </info>
   
-  <para>Önyükleyici kurulduğunda; bilgisayarınızı durdurmanız, çalışan CD' yi
-çıkarmanız ve bilgisayarınızı yeniden başlatmanız istenir. <emphasis
-role="bold"><guibutton>Bitti</guibutton></emphasis> düğmesine tıklayın ve
-sorulduğu gibi aynen <emphasis role="bold">bu sırayla</emphasis> işlem
-yapın!</para>
+  
+  <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>Yeniden başlattığınızda, indirme ilerleme çubuklarını görürsünüz. Bunlar
-yazılım veri kaynağı bilgilerinin indirilmeye başladığını ( Yazılım yönetimi
-bölümüne bakınız ) gösterir.</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/tr/securityLevel.xml b/docs/docs/stable/installer/tr/securityLevel.xml
index 7167f286..73e1d7c1 100644
--- a/docs/docs/stable/installer/tr/securityLevel.xml
+++ b/docs/docs/stable/installer/tr/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tr" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">Güvenlik Seviyesi</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended
-setting for the average user. The <emphasis role="bold">Secure</emphasis>
-setting will create a highly protected system - for instance if the system
-is to be used as a public server.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Security Administrator</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
 which require notification to a system administrator.</para>
 
-  <para>A good, and easy-to-implement, choice is to enter &lt;user>@localhost -
-where &lt;user> is the login name of the user to receive these messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
 be configured for receiving such mail!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/tr/selectCountry.xml b/docs/docs/stable/installer/tr/selectCountry.xml
index bbeb00a4..faf3f73d 100644
--- a/docs/docs/stable/installer/tr/selectCountry.xml
+++ b/docs/docs/stable/installer/tr/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="tr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="tr">
   <info>
     <title xml:id="selectCountry-ti1">Ülke/Bölge seçin</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Bulunduğunuz ülke veya bölgeyi seçin. Bu işlem, para birimi ve kablosuz ağ
-dolaşım alanı gibi her tür ayar için önemlidir. Yanlış ülkeyi seçmek
-Kablosuz ağ kullanımınızı engelleyebilir.</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+like the currency and wireless regulatory domain. Setting the wrong country
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> option and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem that a country from the
-first list was chosen. Please ignore this, as DrakX will apply your actual
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,7 +40,7 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Girdi yöntemi:</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
@@ -39,9 +50,9 @@ selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via <emphasis role="bold">Configure
-your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
-running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tr/selectInstallClass.xml b/docs/docs/stable/installer/tr/selectInstallClass.xml
index 5dbe0377..a172510f 100644
--- a/docs/docs/stable/installer/tr/selectInstallClass.xml
+++ b/docs/docs/stable/installer/tr/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="tr" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Kurulum veya Yükseltme</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>Kurulum</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option to perform a fresh installation of
-<application>Mageia</application>. This will format the root partition (/),
-but can preserve a separated /home partition.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Yükseltme</para>
-
-      <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that has reached
-its End Of Life, then it is better to do a clean install instead while
-preserving your <literal>/home</literal> partition.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that, and only if you are very sure
-rebooting is what you want, go to a text terminal by pressing <guilabel>Alt
-Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the <emphasis role="bold">Install or Upgrade</emphasis>
-screen to the language choice screen by pressing <guilabel>Alt Ctrl
-Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do
-this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/tr/selectKeyboard.xml b/docs/docs/stable/installer/tr/selectKeyboard.xml
index 04fe5416..e7824965 100644
--- a/docs/docs/stable/installer/tr/selectKeyboard.xml
+++ b/docs/docs/stable/installer/tr/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="tr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,19 +19,22 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">Klavye</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX diliniz için uygun bir klavye seçer. Uygun bir klavye bulunamazsa ön
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX diliniz için uygun bir klavye seçer. Uygun bir klavye bulunamazsa ön
 tanımlı olan US klavye düzenini seçecektir.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Seçimin doğru olduğundan emin olun veya başka klavye düzeni
+      <para revision="1" xml:id="selectKeyboard-pa2">Seçimin doğru olduğundan emin olun veya başka klavye düzeni
 seçin. Klavyenizin hangi düzene sahip olduğunu bilmiyorsanız sisteminiz ile
 birlikte gelen özelliklere bakın veya bilgisayar satıcınıza sorun. Klavye
 üzerinde düzenini gösteren bir etiket de bulunabilir. Ayrıca şuraya da
@@ -27,23 +43,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a fuller list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this and
-continue the installation: the keyboard chosen from the full list will be
-applied.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
 extra dialogue screen asking how you would prefer to switch between the
 Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/tr/selectKeyboardLive.xml b/docs/docs/stable/installer/tr/selectKeyboardLive.xml
index 01a88d4a..117bba00 100644
--- a/docs/docs/stable/installer/tr/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/tr/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tr" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Klavye Seçimi</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>Mageia üzerinde kullanmak istediğiniz klavye düzenini ayarlamanız
-istenir. Öntanımlı olan, önceden seçmiş olduğunuz dilinize ve saat
-diliminize göre seçilmiştir.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/tr/selectLanguage.xml b/docs/docs/stable/installer/tr/selectLanguage.xml
index 0229c120..11d13835 100644
--- a/docs/docs/stable/installer/tr/selectLanguage.xml
+++ b/docs/docs/stable/installer/tr/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="tr" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,50 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">Lütfen kullanacağınız dili seçiniz</title>
   </info>
 
-  <para condition="classical">Bulunduğunuz kıtadaki listeyi genişleterek tercih ettiğiniz dili
-seçin. <application>Mageia</application> kurulum sırasında ve kurulumu
-tamamlanmış sistemde bu seçimi kullanacaktır.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Tercih ettiğiniz dili seçin. <application>Mageia</application> kurulum
-sırasında ve kurulumu tamamlanmış sistemde bu seçimi kullanacaktır.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">If it is likely that you (or others) will require several languages to be
-installed on your system, then you should use the <guibutton>Multiple
-languages</guibutton> option to add them now. It will be difficult to add
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
 extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
+  <important condition="classical">
     <para>Even if you choose more than one language, you must first choose one as your
-preferred language in the first language screen. It will also be marked as
-chosen in the multiple languages screen.</para>
-  </warning>
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
-      <para>Klavye diliniz tercih ettiğiniz dilden farklı ise klavyenizin kullandığı
-dili de kurmanız önerilir.</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia, öntanımlı olarak UTF-8 (Unicode) desteğini kullanır.</para>
-
-      <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple
-languages</emphasis> screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>Sisteminizin dilini kurulumdan sonra Mageia Denetim Merkezi -> Sistem ->
-Sisteminizin yerelleştirmesini yönetin bölümünden de değiştirebilirsiniz.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/tr/selectMouse.xml b/docs/docs/stable/installer/tr/selectMouse.xml
index 3f94e5cb..70e7f188 100644
--- a/docs/docs/stable/installer/tr/selectMouse.xml
+++ b/docs/docs/stable/installer/tr/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="tr">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Fare seçin</title>
   </info>
@@ -7,26 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">Farenizin cevap verme şeklinden mutlu değilseniz, farklı bir tanesini burada
 seçebilirsiniz.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Genellikle, <guilabel>Evrensel</guilabel> - <guilabel>Herhangi PS/2 &amp;
-USB fare</guilabel> iyi bir seçim olacaktır.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Altı veya daha fazla düğmesi olan farelerde çalışmayan düğmeleri ayarlamak
-için <guilabel>Evrensel</guilabel> - <guilabel>evdev zorla</guilabel>
-seçeneğini seçin.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/tr/setupBootloader.xml b/docs/docs/stable/installer/tr/setupBootloader.xml
index 4c513186..663083eb 100644
--- a/docs/docs/stable/installer/tr/setupBootloader.xml
+++ b/docs/docs/stable/installer/tr/setupBootloader.xml
@@ -1,149 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="tr" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="tr" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">Önyükleyici ana seçenekleri</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Önyükleyici arayüzü</title>
-    <para>Öntanımlı olarak Mageia sadece şunu kullanır:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>Mageia grafik menüleri güzeldir :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot
-choose between the <emphasis role="bold">with</emphasis> or <emphasis
-role="bold">without graphical menu</emphasis> options.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to house the bootloader
-(GRUB2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds GRUB2-efi. Although it is possible to have
-several ESPs, only one is required (and advised), whatever the number of
-operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Bir Mageia önyükleyicisi kullanmak</title>
-    <para>By default, and according to your system, Mageia writes one of the
-following:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then untick the <emphasis
-role="bold">Probe Foreign OS</emphasis> option.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
   <section>
-    <title>Mevcut bir önyükleyiciyi kullanmak</title>
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this documentation, however in most cases it will
-involve running the relevant bootloader installation program which should
-detect and add it automatically. See the documentation for the operating
-system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Zincirleme yükleme kullanılıyor</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>Önyükleyicinin eksik olduğuna dair bir uyarı alacaksınız. Ancak bunu
-<guibutton>Tamam</guibutton> düğmesine tıklayarak atlayın.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-  <section>
-    <title>Seçenekler</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>İlk sayfa</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you
-set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be required when booting
-to select a booting entry or change settings. The username is <emphasis
-role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will
-check that it matches with the one above.</para></listitem><listitem><para><guilabel>Gelişmiş</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for power management. It can save energy by
-stopping unused devices.  Deselecting it could be useful if, for example,
-your computer does not support ACPI or if you think the ACPI implementation
-might cause some problems (for instance random reboots or system lockups).</para></listitem><listitem><para><guilabel>Enable SMP</guilabel>: This option enables/disables symmetric
-multiprocessing for multi core processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the operating system access to
-the Advanced Programmable Interrupt Controller. APIC devices permit more
-complex priority models, and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC manages all external
-interrupts for a specific processor in an SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>Önyükleyici ana seçenekleri</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Sonraki sayfa</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Öntanımlı:</guilabel> Öntanımlı olarak başlatılacak işletim
-sistemi</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Sonuna ekle:</guilabel> Bu seçenek çekirdek bilgisini geçmenizi
-veya çekirdeğe önyükleme sırasında daha fazla bilgi vermesini söylemenizi
-sağlar.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Yabancı İşletim Sistemini Sorgula</guilabel>: yukarıya bakınız
-<link linkend="setupMageiaBootloader">Bir Mageia önyükleyicisini
-kullanma</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Gelişmiş</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-to be used by the boot menu. If you click the down triangle you will be
-offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">ESP veya MBR'ye dokunma </emphasis>: yukarıya bakınız
-<link linkend="setupChainLoading">Zincirleme yüklemeyi kullanma</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Mevcut bir önyükleyiciyi kullanmak</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Önyükleme Menü Girdisi Ekleme veya Değiştirme</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tr/setupSCSI.xml b/docs/docs/stable/installer/tr/setupSCSI.xml
index d84a418a..6646a037 100644
--- a/docs/docs/stable/installer/tr/setupSCSI.xml
+++ b/docs/docs/stable/installer/tr/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="tr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">SCSI Kur</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
 SCSI controllers it may be unable to determine the correct drivers to use
 and subsequently fail to recognise the drive.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s)
-you have.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">DrakX bundan sonra diskleri doğru olarak yapılandırabilecektir.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/tr/software.xml b/docs/docs/stable/installer/tr/software.xml
new file mode 100644
index 00000000..6ce24392
--- /dev/null
+++ b/docs/docs/stable/installer/tr/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="tr" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/tr/soundConfig.xml b/docs/docs/stable/installer/tr/soundConfig.xml
index 1edd0820..ab47ee98 100644
--- a/docs/docs/stable/installer/tr/soundConfig.xml
+++ b/docs/docs/stable/installer/tr/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="tr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">Ses Yapılandırması</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if one exists.</para>
+  
 
-  <para>Öntanımlı sürücünün sorunsuz çalışması gerekir. Ancak, yüklendikten sonra
-sorunla karşılaşırsanız, <command>draksound</command> komutunu çalıştırın
-veya bu aracı MDD (Mageia Denetim Merkezi) <guilabel>Donanım</guilabel>
-sekmesinde ekranın sağ üst köşesindeki <guilabel>Ses
-Yapılandırması</guilabel> seçeneğini tıklayarak çalıştırın.</para>
+  
 
-  <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis
-role="bold">Sound Configuration</emphasis> tool screen, click on
-<guibutton>Troubleshooting</guibutton> to find useful advice about how to
-solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Gelişmiş</title>
     </info>
 
-    <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in
-this screen, during install, is useful if there is no default driver and
-there are several drivers available, but you think the installer selected
-the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on <emphasis
-role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/tr/takeOverHdConfirm.xml b/docs/docs/stable/installer/tr/takeOverHdConfirm.xml
index 0b1654a0..63e0b0d7 100644
--- a/docs/docs/stable/installer/tr/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/tr/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="tr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Biçimlendirilecek sabit diski onaylayın</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is
-ok to erase every partition, every operating system and all data that might
-be on that hard disk.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/tr/testing.xml b/docs/docs/stable/installer/tr/testing.xml
index d77ee22c..d723ebcb 100644
--- a/docs/docs/stable/installer/tr/testing.xml
+++ b/docs/docs/stable/installer/tr/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Mageia' yı ÇalışanCD Sistemi olarak denemek</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Mageia' yı ÇalışanCD Sistemi olarak denemek</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,23 +17,20 @@
       <title xml:id="testing1-ti1">ÇalışanCD kipi</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>"Mageia Sistemini Başlat" seçerseniz bu ekran ile karşılaşırsınız. Aksi
-takdirde, "<link linkend="doPartitionDisks">Bölümlendirme</link> adımı"na
-geçmiş olursunuz.</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Donanımı Denetlemek</title>
       </info>
 
-      <para>ÇalışanCD kipinin hedeflerinden biri de donanımınızın Mageia tarafından
-doğru şekilde yönetilip yönetilmediğini denetlemektir. Tüm aygıtların bir
-sürücüsünün bulunup bulunmadığını Mageia Denetim Merkezi'ndeki Donanım
-bölümünde denetleyebilirsiniz. En önemli aygıtları şu şekilde
-denetleyebilirsiniz:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -38,11 +38,7 @@ denetleyebilirsiniz:</para>
         </listitem>
 
         <listitem>
-          <para>ekran kartı: bir önceki ekranı gördüyseniz zaten her şey düzgündür.</para>
-        </listitem>
-
-        <listitem>
-          <para>internet kamerası:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -50,7 +46,7 @@ denetleyebilirsiniz:</para>
         </listitem>
 
         <listitem>
-          <para>yazıcı: yazıcınızı yapılandırın ve bir sınama sayfası yazdırın</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -58,10 +54,13 @@ denetleyebilirsiniz:</para>
         </listitem>
       </itemizedlist>
 
-      <para>Her şey tamamsa, kuruluma geçebilirsiniz. Aksi takdirde, çıkış düğmesi ile
-kurulum ortamından ayrılabilirsiniz.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>Burada yaptığınız yapılandırma ayarlaı kurulum için saklanacaktır.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -69,14 +68,14 @@ kurulum ortamından ayrılabilirsiniz.</para>
         <title xml:id="testing3-ti1">Kurulumu başlatmak</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>Mageia ÇalışanCD veya ÇalışanDVD ile sabit diske veya katı hal diskine
-kurulumu başlatmak için basitçe "Sabit Diske Kur" simgesine tıklayın. Bu
-ekrana ulaşacak ve sonra doğrudan kurulum için "<link
-linkend="doPartitionDisks">Bölümlendirme</link>" aşamasına geçeceksiniz.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/tr/uninstall-Mageia.xml b/docs/docs/stable/installer/tr/uninstall-Mageia.xml
index 92c60cbb..3ed8cc26 100644
--- a/docs/docs/stable/installer/tr/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/tr/uninstall-Mageia.xml
@@ -1,31 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="tr">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="tr" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Mageia' yı Kaldırma</title>
   </info>
 
   
 
+  
+
   <para>If Mageia didn't convince you or you can't install it correctly - in short
 you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-  <para>After your data backup, reboot your Mageia installation DVD and select
-<emphasis role="bold">Rescue system</emphasis>, then, <emphasis
-role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
-will only have Windows, with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>In Windows to recover the space used by Mageia partitions: click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code>. You will recognize a Mageia partition
-because they are labeled <guilabel>Unknown</guilabel>, and also by their
-size and place on the disk. Right click on each of these partitions and
-select <guibutton>Delete</guibutton> to free up the space.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-  <para>Windows XP kullanıyorsanız, yeni bir disk bölümü oluşturarak (FAT32 veya
-NTFS biçiminde) biçimlendirebilirsiniz. Disk bölümü harfini daha sonra
-alacaktır.</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>If you have Vista or 7, you have one more possibility, you can extend the
 existing partition that is at the left of the freed space. There are other
@@ -33,4 +45,4 @@ partitioning tools that can be used, such as <emphasis
 role="bold">gparted</emphasis>, available for both Windows and Linux. As
 always, when changing partitions, be very careful to back up anything
 important to you.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/tr/unused.xml b/docs/docs/stable/installer/tr/unused.xml
index 073a5131..c274bba0 100644
--- a/docs/docs/stable/installer/tr/unused.xml
+++ b/docs/docs/stable/installer/tr/unused.xml
@@ -1,28 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="tr" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="tr">
   <info>
     <title xml:id="unused-ti1">Kullanılmayan maddeyi sakla veya sil</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
 
-  <para>Bu adımda, kurulum aracı kullanılmayan yerelleştirme paketlerini ve
-kullanılmayan donanım paketlerini arar. Sonra bunları silmeyi önerir. Farklı
-bir donanım senaryosu için kurulum yapmıyorsanız bu öneriyi kabul etmek iyi
-bir fikir olabilir.</para>
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>Bir sonraki adım, dosyaların sabit diske kopyalanmasıdır. Bu işlem biraz
-zaman alabilir. Sonunda, kısa süreliğine boş bir ekran ile
-karşılaşabilirsiniz fakat bu durum gayet olağandır.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/uk/.directory b/docs/docs/stable/installer/uk/.directory
new file mode 100644
index 00000000..b5df72ed
--- /dev/null
+++ b/docs/docs/stable/installer/uk/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2019,1,6,19,52,5
+Version=4
+ViewMode=1
diff --git a/docs/docs/stable/installer/zh_CN/DrakLive-cover.xml b/docs/docs/stable/installer/zh_CN/DrakLive-cover.xml
index cd3cef13..7860dc2b 100644
--- a/docs/docs/stable/installer/zh_CN/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/zh_CN/DrakLive-cover.xml
@@ -1,71 +1,99 @@
-<?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="zh_CN" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="zh_CN" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>从 LIVE 介质安装</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>2015 年一月</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>从 LIVE 介质安装</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageia 的官方文档</para>
+      <para role="tagline">Mageia 的官方文档</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-            <para>此手册中的文本和屏幕截图以 CC BY-SA 3.0 协议（<link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>）发布。
-            </para>
-            <para>此手册由 <link ns6:href="http://www.neodoc.biz">NeoDoc</link> 开发的 <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> 生成。
-            </para>
-            <para>内容由志愿者编写。若您希望完善此手册，请联系 <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。</para> 
+
+      <para>此手册中的文本和屏幕截图以 CC BY-SA 3.0 协议（<link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>）发布。</para>
+
+      <para>此手册由 <link ns6:href="http://www.neodoc.biz">NeoDoc</link> 开发的 <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> 生成。</para>
+
+      <para>内容由志愿者编写。若您希望完善此手册，请联系 <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。</para>
     </cover>
   </info>
+
   <article>
     <title>从 LIVE 介质安装</title>
-       <para><note>
-          <para>其他人不一定能在此手册中看到你所看到的安装页面。这取决于你的硬件规格以及安装时的选项。</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <para><note>
+        <para>其他人不一定能在此手册中看到你所看到的安装页面。这取决于你的硬件规格以及安装时的选项。</para>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
+
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/zh_CN/DrakLive.xml b/docs/docs/stable/installer/zh_CN/DrakLive.xml
index f5dfb34c..d9aac8e9 100644
--- a/docs/docs/stable/installer/zh_CN/DrakLive.xml
+++ b/docs/docs/stable/installer/zh_CN/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="zh_CN" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="zh_CN" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>从 LIVE 介质安装</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>从 LIVE 介质安装</title>
 
     <cover>
       <para><note>
@@ -13,8 +28,9 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
       <para>此手册由 <link ns6:href="http://www.neodoc.biz">NeoDoc</link> 开发的 <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> 生成。</para>
 
-      <para>内容由志愿者编写。若您希望完善此手册，请联系 <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</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>
 
@@ -34,7 +50,12 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。<
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -44,17 +65,18 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。<
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/zh_CN/DrakX-cover.xml b/docs/docs/stable/installer/zh_CN/DrakX-cover.xml
index d759eeac..679c6c7c 100644
--- a/docs/docs/stable/installer/zh_CN/DrakX-cover.xml
+++ b/docs/docs/stable/installer/zh_CN/DrakX-cover.xml
@@ -1,110 +1,149 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="zh_CN" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="zh_CN" xml:id="Quick-Startup"
+      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>用 DrakX 安装</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>2014 年二月</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>2014 年二月</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageia 的官方文档</para>
+      <para role="tagline">Mageia 的官方文档</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
-	    <para>此手册中的文本和屏幕截图以 CC BY-SA 3.0 协议（<link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>）发布。
-	    </para>
-	    <para>此手册由 <link ns6:href="http://www.neodoc.biz">NeoDoc</link> 开发的 <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> 生成。
-	    </para>
-            <para>内容由志愿者编写。若您希望完善此手册，请联系 <link
-ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。</para> 
+
+      <para>此手册中的文本和屏幕截图以 CC BY-SA 3.0 协议（<link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>）发布。</para>
+
+      <para>此手册由 <link ns6:href="http://www.neodoc.biz">NeoDoc</link> 开发的 <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> 生成。</para>
+
+      <para>内容由志愿者编写。若您希望完善此手册，请联系 <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>用 DrakX 安装</title>
-       <para><note>
-          <para>其他人不一定能在此手册中看到你所看到的安装页面。这取决于你的硬件规格以及安装时的选项。</para>
-        </note></para>
-  
-  
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    <para><note>
+        <para>其他人不一定能在此手册中看到你所看到的安装页面。这取决于你的硬件规格以及安装时的选项。</para>
+      </note></para>
+
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -112,29 +151,32 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。<
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/zh_CN/DrakX-inline.xml b/docs/docs/stable/installer/zh_CN/DrakX-inline.xml
new file mode 100644
index 00000000..15a471bf
--- /dev/null
+++ b/docs/docs/stable/installer/zh_CN/DrakX-inline.xml
@@ -0,0 +1,133 @@
+<?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="zh_CN" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>用 DrakX 安装</title>
+
+    <cover>
+      <para><note>
+          <para>其他人不一定能在此手册中看到你所看到的安装页面。这取决于你的硬件规格以及安装时的选项。</para>
+        </note></para>
+
+      <para xml:id="CC_BY-SA">此手册中的文本和屏幕截图以 CC BY-SA 3.0 协议（<link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>）发布。</para>
+
+      <para>此手册由 <link ns6:href="http://www.neodoc.biz">NeoDoc</link> 开发的 <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> 生成。</para>
+
+      <para>内容由志愿者编写。若您希望完善此手册，请联系 <link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。</para>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/DrakX.xml b/docs/docs/stable/installer/zh_CN/DrakX.xml
index d160b6c6..e3c9e5d6 100644
--- a/docs/docs/stable/installer/zh_CN/DrakX.xml
+++ b/docs/docs/stable/installer/zh_CN/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="zh_CN" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="zh_CN" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>用 DrakX 安装</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>用 DrakX 安装</title>
 
     <cover>
       <para><note>
@@ -29,18 +67,6 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。<
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -55,23 +81,28 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。<
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -81,7 +112,10 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。<
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -89,19 +123,25 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。<
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -109,11 +149,15 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。<
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -132,4 +176,4 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">文档团队</link>。<
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/zh_CN/SelectAndUseISOs2.xml b/docs/docs/stable/installer/zh_CN/SelectAndUseISOs2.xml
index 8d8a1e61..0d205bc0 100644
--- a/docs/docs/stable/installer/zh_CN/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/zh_CN/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="zh_CN" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">选择和使用 ISO</title>
   </info>
   <section>
     <title>简介</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
-    <para>There are two families of media:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: Booting with this media provides you with the maximum
-flexibility when choosing what to install, and for configuring your
-system. In particular, you have a choice of which Desktop environment to
-install</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: This option allows you to try out Mageia without having to
-actually install it, or make any changes to your computer.  If the
-installation is decided, the process is simpler, but you get fewer choices
-than offered by the Classical installer</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>下一节中将涉及有关细节。</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>介质</title>
     <section>
       <title>定义</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support (DVD, USB
-stick, ...) the ISO file is copied to.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
@@ -43,23 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>通用特性</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the Classical installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
             <para>They are used for performing clean installs or to upgrade a previously
-installed version of Mageia.</para>
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>欢迎屏幕中列出了一些可用的工具，如：救援系统、内存测试、硬件检测工具。</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>每个 DVD 中包含多种桌面环境和语言支持。</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>您可以在安装时添加非自由软件。</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -71,21 +107,19 @@ installed version of Mageia.</para>
         <itemizedlist>
           <listitem>
             <para>Can be used to preview the Mageia operating system without having to install
-it. Can also be used to install Mageia if you wish.</para>
+it</para>
           </listitem>
           <listitem>
-            <para>每个 ISO 仅包含一种桌面环境（KDE Plasma、GNOME 或 Xfce）。</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade previously installed Mageia
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>其中包含非自由软件。</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -93,13 +127,13 @@ releases.</emphasis></para>
         <title>Live DVD KDE</title>
         <itemizedlist>
           <listitem>
-            <para>仅包含 KDE（Plasma）桌面环境。</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>仅支持 64 位处理器。</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -107,13 +141,13 @@ releases.</emphasis></para>
         <title>Live DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>仅包含 GNOME 桌面环境。</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>仅支持 64 位处理器</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -121,13 +155,13 @@ releases.</emphasis></para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>仅包含 Xfce 桌面环境。</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>同时支持 32 位和 64 位处理器。</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -138,22 +172,10 @@ releases.</emphasis></para>
         <title>通用特性</title>
         <itemizedlist>
           <listitem>
-            <para>These are minimal ISO's containing no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient if
-bandwidth is too low to download a full DVD, or if you have a PC without a
-DVD drive or is unable to boot from a USB stick.</para>
-          </listitem>
-          <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>First steps are English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -161,7 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>仅包含自由软件，适用于不希望使用非自由软件的人。</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -169,7 +192,7 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>包含部分用户所需的非自由软件（主要为驱动、编码器）。</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -181,16 +204,23 @@ DVD drive or is unable to boot from a USB stick.</para>
       <title>下载中</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, you are provided with some information, such as
-the mirror in use and an option to switch if the bandwidth is too low. If
-http is chosen, you will also see something regarding checksums.</para>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the
-other, and copy the checksum <link linkend="integrity">for later
-use</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">检查下载文件的完整性</title>
@@ -198,50 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
 algorithm from the file to be downloaded. You may compare the checksum of
 your downloaded ISO against that of the original source ISO. If the
 checksums do not match, it means that the actual data on the ISO's do not
-match, and if it is the case, then you should retry the download or attempt
-a repair using BitTorrent.</para>
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>To generate the checksum for your downloaded ISO, open a console, (no need
 to be root), and:</para>
       <itemizedlist>
         <listitem>
-          <para>To use md5sum, type: <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>To use sha1sum, type: <userinput>sha1sum
-path/to/the/image/file.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Example:</para>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>刻录或转储 ISO</title>
-    <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
-stick. This is not a standard copy operation as a bootable medium will
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
 actually be created.</para>
     <section>
       <title>将ISO文件刻录到CD或DVD</title>
-      <para>Whichever software you use, ensure that the option to burn an <emphasis
-role="bold">image</emphasis> is used, burn <emphasis
-role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not
-correct. See <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link> for more information.</para>
     </section>
     <section>
       <title>写入 ISO 到 U 盘</title>
-      <para>所有的 Mageia  ISO 均为混合类型 ISO，因此您可以将其“转储”到 U 盘中，然后使用 U 盘来引导和安装系统。</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any existing data will be lost and the partition capacity will
-be reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>若要恢复原始容量，您必须重新进行分区和格式化操作。</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>使用 Mageia 的图形化工具</title>
         <para>您可以使用 <link
@@ -254,7 +297,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <itemizedlist>
           <listitem>
             <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -263,7 +306,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>使用 GNU/Linux 系统中的命令行程序</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk overwriting
 potentially valuable existing data if you specify the wrong target device.</para>
@@ -273,26 +316,27 @@ potentially valuable existing data if you specify the wrong target device.</para
             <para>打开一个终端</para>
           </listitem>
           <listitem>
-            <para>Become a root (Administrator) user with the command <userinput>su
--</userinput> (don't forget the final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>插入您的 U 盘（无需挂载，并且不要用任何应用程序或文件管理器访问它）</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>输入命令 <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
             <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
             <para>Alternatively, you can find the device name with the command
-<code>dmesg</code>: towards the end of this example, you can see the device
-name starting with <emphasis>sd</emphasis>, and in this case,
-<emphasis>sdd</emphasis> is the actual device. You can also see that its
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
 size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
@@ -314,21 +358,22 @@ size is 2GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: <emphasis role="bold"># <userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Where X=your device name eg: /dev/sdd</para>
-            <para>Example:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-and <emphasis role="bold">of</emphasis> stands for <emphasis
-role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>输入命令：# <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>This is the end of the process, and you may now unplug your USB stick.</para>
@@ -337,4 +382,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/acceptLicense.xml b/docs/docs/stable/installer/zh_CN/acceptLicense.xml
index 401cf09f..95fc6a7d 100644
--- a/docs/docs/stable/installer/zh_CN/acceptLicense.xml
+++ b/docs/docs/stable/installer/zh_CN/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">许可证和发行说明</title>
   </info>
 
@@ -46,14 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">许可协议</title>
     </info>
 
-    <para>在安装 <application>Mageia</application> 之前，请先仔细阅读许可条款和许可条件。</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>这些许可条款和许可条件适用于整个 <application>Mageia</application> 发行版，你必须予以接受才能继续安装。</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>To proceed, simply select <guilabel>Accept</guilabel> and then click on
-<guibutton>Next</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>若你不希望接受这些条件，我们向您表示诚挚歉意。请点击 <guibutton>退出</guibutton> 来重启计算机。</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -71,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Important information about this release of
-<application>Mageia</application> can be viewed by clicking on the
-<guibutton>Release Notes</guibutton> button.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/addUser.xml b/docs/docs/stable/installer/zh_CN/addUser.xml
index 986e54d3..88e2459d 100644
--- a/docs/docs/stable/installer/zh_CN/addUser.xml
+++ b/docs/docs/stable/installer/zh_CN/addUser.xml
@@ -1,32 +1,51 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">用户和管理员管理</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">设置管理员（root 账户）密码：</title>
     </info>
 
-    <para>It is advisable for all <application>Mageia</application> installations to
-set a <emphasis role="bold">superuser</emphasis> (administrator) password,
-usually called the <emphasis>root password</emphasis> in Linux. As you type
-a password into the top box a shield will change from red to yellow to green
-depending on the strength of the password. A green shield shows you are
-using a strong password. You need to repeat the same password in the box
-underneath, to check that the first entry was not mistyped.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>All passwords are case sensitive. It is best to use a mixture of letters
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
 (upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
@@ -36,41 +55,46 @@ underneath, to check that the first entry was not mistyped.</para>
       <title xml:id="enterUser-ti3">输入用户名</title>
     </info>
 
-    <para>Add a user here. A regular user has fewer privileges than the <emphasis
-role="bold">superuser</emphasis> (root), but enough to use the internet,
-office applications or play games and anything else the average user might
-use their computer for.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>图标</guibutton>：若点击此按钮，则会改变用户图标。</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>真实姓名</guilabel>：在文本框中输入用户的真名。</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use
-a version of the user's real name. <emphasis role="bold">The login name is
-case sensitive.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password</guilabel>: Type in the user password. There is a shield
-at the end of the text box that indicates the strength of the password. (See
-also <xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password (again)</guilabel>: Retype the user password DrakX will
-check that you have not mistyped the password.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Any users you added while installing Mageia, will have a home directory that
-is both read and write protected (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
@@ -80,32 +104,31 @@ management</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">高级用户管理</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>The <guibutton>Advanced</guibutton> option allows you to edit further
-settings for the user you are adding.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
-<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis>
-and <emphasis role="bold">Sh</emphasis></para>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the <emphasis
-role="bold">user ID</emphasis> for any user you added in the previous
-screen. If you are unsure what the purpose of this is, then leave it blank.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/add_supplemental_media.xml b/docs/docs/stable/installer/zh_CN/add_supplemental_media.xml
index 253a31f1..7a6e08c4 100644
--- a/docs/docs/stable/installer/zh_CN/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/zh_CN/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="zh_CN">
   <info>
-    <title xml:id="add_supplemental_media-ti1">介质选择 (设置增补的安装介质)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,43 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>This screen shows you the list of already recognized repositories. You can
-add other sources for packages, like an optical disc or a remote source.
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
 The source selection determines which packages will be available during the
-next steps.</para>
+subsequent steps.</para>
 
   <para>如果需要获取网络资源，请执行以下两步：</para>
 
   <orderedlist>
     <listitem>
-      <para>若尚未启用网络链接，请选择并启用它。</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
       <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
 mirror, you have access to the selection of all repositories managed by
-Mageia, like the <emphasis role="bold">Nonfree</emphasis>, the <emphasis
-role="bold">Tainted</emphasis> repositories and the <emphasis
-role="bold">Updates</emphasis>. With the URL, you can designate a specific
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
 repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>If you are updating a 64 bit installation which may contain some 32 bit
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
 packages, it is advised to use this screen to add an online mirror by
-ticking one of the Network protocols here. The 64-bit DVD ISO only contains
-64-bit and noarch packages, it will not be able to update the 32-bit
-packages. However, after adding an online mirror, the installer will find
-the needed 32-bit packages there.</para>
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/ask_mntpoint_s.xml b/docs/docs/stable/installer/zh_CN/ask_mntpoint_s.xml
index d59d6a2d..66408cf5 100644
--- a/docs/docs/stable/installer/zh_CN/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/zh_CN/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="zh_CN">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">选择挂载点</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,41 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>这里你可以查看已找到的 Linux 分区。如果 <application>DrakX</application> 的建议不合适，你可以手动更改挂载点。</para>
-
-  <note>
-    <para>If you change anything, make sure you still have a <emphasis
-role="bold"><literal>/</literal></emphasis> (root) partition.</para>
-  </note>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
+
+  <para>Here you see the Linux partitions that have been found on your computer. If
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis
-role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
-name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis>
-(for example, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>If you have several partitions, you can choose various different mount
-points from the drop down menu, such as <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis
-role="bold">/var</emphasis>. You can even make your own mount points, for
-instance <emphasis role="bold"><literal>/video</literal></emphasis> for a
-partition where you want to store your films, or <emphasis
-role="bold">/Data</emphasis> (or some other name) for your data.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -77,11 +82,17 @@ mount point field blank.</para>
   </itemizedlist>
 
   <warning>
-    <para>If you are not sure what to choose, click <emphasis
-role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
-disk partitioning</guilabel>, where, you can click on a partition to see its
-type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
-  <para>若确定挂载点设置正确，则可点击 <guibutton>下一步</guibutton>，并确定是否根据 DrakX 的建议格式化分区等。</para>
-</section>
\ No newline at end of file
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
+  <para>If you are sure the mount points are correct, click on
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/bestTime.xml b/docs/docs/stable/installer/zh_CN/bestTime.xml
index c0ce65fb..bfe47795 100644
--- a/docs/docs/stable/installer/zh_CN/bestTime.xml
+++ b/docs/docs/stable/installer/zh_CN/bestTime.xml
@@ -1,20 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="zh_CN" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="zh_CN" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">时钟设置</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>在这一步中，你需要选择内部时钟的计时方式（本地时间或 UTC 时间）。</para>
-
-  <para>在高级选项卡中，你可以找到更多有关时钟设置的选项。</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/bootLive.xml b/docs/docs/stable/installer/zh_CN/bootLive.xml
index 578cb584..9be3a579 100644
--- a/docs/docs/stable/installer/zh_CN/bootLive.xml
+++ b/docs/docs/stable/installer/zh_CN/bootLive.xml
@@ -1,7 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="zh_CN"><info><title xml:id="bootLive-ti1">引导 Mageia Live 系统</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">引导媒体</title></info><section><info><title xml:id="bootLive11-ti1">自磁盘</title></info><para>可以使用刻录的镜像（CD-ROM，DVD-ROM等）直接引导
-Mageia。只需将媒体插入到光盘驱动器中，然后重启电脑即可。若没有出现引导画面，则需要手动修改 BIOS
-配置，或者在电脑启动时按下特定按键来选择引导设备。</para><para>根据你所使用的硬件以及配置的不同，接下来还有一些安装选项需要设置。</para></section><section><info><title xml:id="bootLive12-ti1">自 USB 设备</title></info><para>你可以通过写有镜像 ISO 的 USB 设备来引导 Mageia。根据 BIOS 设置不同，电脑可能直接从插入的 USB 设备上启动，也可能跳过 USB
-设备。在后一种情况下，你需要手动修改 BIOS 配置，或在电脑启动时按下特定按键来选择引导设备。</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">在 BIOS/CSM/Legacy 模式下</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>在 BIOS 模式下引导时的第一个画面</para></caption></mediaobject><para>中间的菜单提供了三个可选操作：</para><itemizedlist><listitem><para>Boot Mageia：将从媒体（CD/DVD 或 U 盘）直接启动 Mageia
-5，并且不会向硬盘写入任何数据，所以系统可能运行较慢。引导完成后，即可将系统安装到硬盘。</para></listitem><listitem><para>Install Mageia：将 Mageia 直接安装到硬盘。</para></listitem><listitem><para>Boot from hard disk：从硬盘引导，和不使用引导媒体的情况相同（即不启动 Mageia 5）。</para></listitem></itemizedlist><para>底部菜单中提供了引导选项：</para><itemizedlist><listitem><para>F1 - 帮助。说明”splash“、”apm“、”acpi“、”ide“等选项。</para></listitem><listitem><para>F2 - 语言。选择用于显示的语言。</para></listitem><listitem><para>F3 -屏幕分辨率。选择 640x400、800x600、1024x728 或纯文本模式。</para></listitem><listitem><para>F4 - CD-Rom。CD-Rom 相关选项。一般通过插入的安装媒体来安装，但也可以选择 FTP、NFS 等其他安装源。如果通过网络上的 SLP
-服务器来安装，请用此选项选择一个服务器上可用的安装源。</para></listitem><listitem><para>F5 - 驱动。是否使用驱动。系统将在安装过程中提醒需要使用驱动更新的磁盘，并将其插入。</para></listitem><listitem><para>F6 - 内核选项。用于指定与硬件和驱动相关的内核参数。</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">在 UEFI 模式下</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>在 UEFI 模式下引导时的第一个画面</para></caption></mediaobject><para>你可以选择以 Live 模式运行 Mageia（第一个选项）或者直接进行安装（第二个选项）。</para><para>若从 U 盘引导，除了以”uSB“结尾的行以外，还会有额外的两行供选择。</para><para>在不同选项中，都需要先选择语言、时区和键盘布局，然后 <link linkend="testing">Live 模式下会有额外的步骤</link>。</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">引导 Mageia Live 系统</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">引导媒体</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">在 BIOS/CSM/Legacy 模式下</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>在 BIOS 模式下引导时的第一个画面</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">在 UEFI 模式下</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/chooseDesktop.xml b/docs/docs/stable/installer/zh_CN/chooseDesktop.xml
index 86e86fdf..9feb86d2 100644
--- a/docs/docs/stable/installer/zh_CN/chooseDesktop.xml
+++ b/docs/docs/stable/installer/zh_CN/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">桌面环境选择</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">桌面环境选择</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide-show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> or <application>GNOME</application>
-desktop environment. Both come with a full set of useful applications and
-tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
-use both), or if you want to modify the default software choices for these
-desktop environments. The <application>LXDE</application> desktop, for
-instance, is lighter than the previous two, sporting less eye candy and
-fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/choosePackageGroups.xml b/docs/docs/stable/installer/zh_CN/choosePackageGroups.xml
index 24f7e317..e0b6b954 100644
--- a/docs/docs/stable/installer/zh_CN/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/zh_CN/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">选择软件包组</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/zh_CN/choosePackagesTree.xml b/docs/docs/stable/installer/zh_CN/choosePackagesTree.xml
index 9abd734b..38ccfb9d 100644
--- a/docs/docs/stable/installer/zh_CN/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/zh_CN/choosePackagesTree.xml
@@ -1,18 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="zh_CN">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="zh_CN">
   <info>
     <title xml:id="choosePackagesTree-ti1">选择单个软件包</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-  <para>在确定选择后，您可以点击页面底部的 <guibutton>floppy icon</guibutton> 按钮来保存选择（同时也会将配置保存到  U
-盘中）。你可以使用此文件在其他系统上进行相同的安装部署（只需在安装时再次点击此按钮并加载配置文件即可）。</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/configureServices.xml b/docs/docs/stable/installer/zh_CN/configureServices.xml
index f38adab8..1520d6b5 100644
--- a/docs/docs/stable/installer/zh_CN/configureServices.xml
+++ b/docs/docs/stable/installer/zh_CN/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="zh_CN" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">配置服务</title>
   </info>
@@ -7,19 +7,30 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose are usually good.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">若高亮选中服务，则可在下方的信息框中查看此服务的细节。</para>
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">若高亮选中服务，则可在下方的信息框中查看此服务的细节。</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">只有在您完全了解您的行为的风险后再作出改动。</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/configureTimezoneUTC.xml b/docs/docs/stable/installer/zh_CN/configureTimezoneUTC.xml
index d9da19a2..b57a165d 100644
--- a/docs/docs/stable/installer/zh_CN/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/zh_CN/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="zh_CN">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="zh_CN">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">配置时区</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the
-same time-zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
 or to GMT, also known as UTC.</para>
diff --git a/docs/docs/stable/installer/zh_CN/configureX_card_list.xml b/docs/docs/stable/installer/zh_CN/configureX_card_list.xml
index 8796da96..e20bfb9a 100644
--- a/docs/docs/stable/installer/zh_CN/configureX_card_list.xml
+++ b/docs/docs/stable/installer/zh_CN/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="zh_CN">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,45 +26,48 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">选择一个X服务器(配置您的显示卡)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX 有齐全的显卡数据库，一般情况下可以正确识别您的视频设备。</para>
 
   <para>若安装程序无法正确检测您的显卡，请在以下列表中选择一个合适的配置： <itemizedlist>
       <listitem>
-        <para>制造商</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>显卡名</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>卡的类型</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-<emphasis role="bold">Xorg</emphasis> category, which provides more than 40
-generic and open source video card drivers. If you still can't find a
-specific driver for your card there is the option of using the <emphasis
-role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the <emphasis role="bold">Command-line</emphasis> Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the <emphasis role="bold">Nonfree</emphasis>
-repository and in some cases only from the card manufacturers' websites.</para>
-
-  <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be
-explicitly enabled to access them. If you didn't enable it previously, you
-should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/configureX_chooser.xml b/docs/docs/stable/installer/zh_CN/configureX_chooser.xml
index a8b1e153..3d1db26c 100644
--- a/docs/docs/stable/installer/zh_CN/configureX_chooser.xml
+++ b/docs/docs/stable/installer/zh_CN/configureX_chooser.xml
@@ -1,60 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="zh_CN">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">显示卡和显示器配置</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym> or any other graphical environment to work well, the
-following <acronym>X</acronym> settings need to be correct. Choose the
-correct settings if none are shown, or if you think the details are
-incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>显卡</guibutton></emphasis>：请从列表中选择您的显卡设备。</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from
-the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose
-<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and
-vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">不正确的刷新率可能会损坏显示器</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and
-color depth of your monitor can be set here.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the option is there, and you test your
-settings, you should be ask whether your settings are correct. If you answer
-<emphasis role="bold">yes</emphasis>, the settings will be kept. If you
-don't see anything, you'll return to the configuration screen and be able to
-reconfigure everything until the test result is satisfactory. If the test
-option is not available, then make sure your settings are on the safe side.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>选项</guibutton></emphasis>：您可以在此处启用或禁用各类选项。</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/configureX_monitor.xml b/docs/docs/stable/installer/zh_CN/configureX_monitor.xml
index 873c1704..5bffddc0 100644
--- a/docs/docs/stable/installer/zh_CN/configureX_monitor.xml
+++ b/docs/docs/stable/installer/zh_CN/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="zh_CN">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,55 +23,77 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">选择您的显示器</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX 有齐全的显卡数据库，一般情况下可以正确识别您的视频设备。</para>
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX 有齐全的显卡数据库，一般情况下可以正确识别您的视频设备。</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
 could damage your monitor or video hardware. Please don't try something
 without knowing what you are doing.</emphasis> If in doubt you should
 consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>自定义</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">自定义</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">此选项允许您设置两个重要参数：垂直刷新率和水平同步率。垂直刷新率决定屏幕刷新的周期，水平同步率决定扫描行的显示速率。</para>
-
-  <para revision="1" xml:id="configureX_monitor-pa4"><emphasis>请不要</emphasis>选择与您的显示器不匹配的同步范围，这样做可能损害显示器。若仍有疑问，请查询显示器文档。</para>
-
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>即插即用</emphasis></para>
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
+rate and the horizontal sync rate. Vertical refresh determines how often the
+screen is refreshed and horizontal sync is the rate at which scan lines are
+displayed.</para>
 
-  <para xml:id="configureX_monitor-pa6" revision="1">默认选项，根据显示器数据库确定显示器类别。</para>
+        <para revision="1" xml:id="configureX_monitor-pa4"><emphasis>请不要</emphasis>选择与您的显示器不匹配的同步范围，这样做可能损害显示器。若仍有疑问，请查询显示器文档。</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>供应商</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">若安装程序无法正确检测您的显示器，请在以下列表中选择一个合适的配置： <itemizedlist>
       <listitem>
-        <para>制造商</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>显示器制造商名称</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>显示器描述</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">若安装程序无法正确检测您的显示器，请在以下列表中选择一个合适的配置：</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>通用</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the <emphasis
-role="bold">Vesa</emphasis> card driver when your video hardware cannot be
-determined automatically. Once again it may be wise to be conservative in
-your selections.</para>
-</section>
\ No newline at end of file
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/diskPartitioning.xml b/docs/docs/stable/installer/zh_CN/diskPartitioning.xml
new file mode 100644
index 00000000..3e9ce183
--- /dev/null
+++ b/docs/docs/stable/installer/zh_CN/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="zh_CN" version="5.0" xml:lang="zh_CN">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/diskdrake.xml b/docs/docs/stable/installer/zh_CN/diskdrake.xml
index 5f11190b..e38fa70a 100644
--- a/docs/docs/stable/installer/zh_CN/diskdrake.xml
+++ b/docs/docs/stable/installer/zh_CN/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">使用 DiskDrake 自定义磁盘分区方式</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis>
-partition you must ensure that you have a separate <emphasis
-role="bold">/boot</emphasis> partition. The encryption option for the
-<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise
-your system will be unbootable.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view their details before you start.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage
-device like a USB key). In the screen-shot above there are two available
-devices: <emphasis role="bold">sda </emphasis>and <emphasis
-role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if
-you are sure you want to wipe all partitions on the selected storage device.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Expert mode</guibutton> provides more options such as a label
-(give a name to) a partition, or to choose a partition type.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1"> 准备好时点击<guibutton>完成</guibutton>按钮。</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
-Partition) is present and correctly mounted on /boot/EFI (see below)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml b/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml
index 6d36aa94..e099a0ed 100644
--- a/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/zh_CN/doPartitionDisks.xml
@@ -1,160 +1,207 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">分区</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the
-DrakX partitioning proposals for where to install
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the
-layout and content of your particular hard drive(s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
-
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">使用现存的分区</para>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">若此选项可用，表面安装程序找到了现存的 Linux 分区，并且可以将其用于 Mageia 的安装。</para>
-      </listitem>
+  <itemizedlist>
+    <title>Main Options</title>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">使用空闲空间</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">若硬盘上有未使用的区域，此选项将会把 Mageia 安装到该区域中。</para>
-      </listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa5">若此选项可用，表面安装程序找到了现存的 Linux 分区，并且可以将其用于 Mageia 的安装。</para>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">使用 Windows 分区中的空闲空间</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">若现存 Windows 分区中有空闲空间，安装程序将把 Mageia 安装在此处。</para>
+      <para revision="1" xml:id="doPartitionDisks-pa7">若硬盘上有未使用的区域，此选项将会把 Mageia 安装到该区域中。</para>
+    </listitem>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">此选项可用于为 Mageia 腾出安装空间，但操作过程有一定风险。请您确保已经备份了所有重要文件！</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para revision="3" xml:id="doPartitionDisks-pa11">将会缩小 Windows 分区的大小。该分区必须为“clean”状态，即上一次使用 Windows
-时必须正常地关机或重启。同时，该分区也应当进行碎片整理，即便不能将文件碎片完全移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para>With this option, the installer displays the remaining Windows partition in
+      <para>With this option, the installer displays the remaining Windows partition in
 light blue and the proposed Mageia partition in dark blue with their
 intended sizes just underneath. You have the option to modify these sizes by
-clicking and dragging the gap between both partitions. See the following
-screen-shot.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">擦除磁盘，并使用整个磁盘。</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">This option will allocate the entire drive for Mageia.</para>
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">注意！将会删除所选驱动器上的所有数据！请谨慎操作！</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">若您需要将磁盘的一部分用于存储其他数据，或者您不希望驱动器上的数据丢失，请不要使用此选项。</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">Custom disk partitioning</para>
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">允许您完全控制系统在硬盘上的安装方式。</para>
-      </listitem>
-    </itemizedlist></para>
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
 
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">将会缩小 Windows 分区的大小。该分区必须为“clean”状态，即上一次使用 Windows
+时必须正常地关机或重启。同时，该分区也应当进行碎片整理，即便不能将文件碎片完全移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。</para>
+      </important>
+    </listitem>
 
-  <para>If you are not using the <emphasis role="bold">Custom disk
-partitioning</emphasis> option, the installer will allocate the available
-space according to the following rules:</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>If the total available space is less than 50 GB, then only one partition is
-created. This will be the <emphasis role="bold">/</emphasis> (root)
-partition.</para>
-      </listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa17">允许您完全控制系统在硬盘上的安装方式。</para>
+    </listitem>
+  </itemizedlist>
 
-      <listitem>
-        <para>If the total available space is greater than 50 GB, then three partitions
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
 are created</para>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 of the total available place is allocated to <emphasis
-role="bold">/</emphasis> with a maximum of 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 被分配给交换分区，最大不超过 4GB</para>
-          </listitem>
-
-          <listitem>
-            <para>the rest (at least 12/19) is allocated to <emphasis
-role="bold">/home.</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
+
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-  <para>That means that from 160 GB or greater available space, the installer will
-create three partitions: 50 GB for <emphasis role="bold">/</emphasis>, 4 GB
-for <emphasis role="bold">swap</emphasis> and the remainder for <emphasis
-role="bold">/home</emphasis>.</para>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
+
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
-automatically detected - or created if it does not exist yet, and mounted on
-/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to
-create a BIOS boot partition if not already existing. It is a roughly 1 MiB
-partition with no mount point. Choose <xref linkend="diskdrake"/> to be able
-to create it with the Installer like any other partition, just select BIOS
-boot partition as the filesystem type.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512. Due to lack of available hardware, the
 partitioning tool used in the installer has not been tested with such a
-drive. Also some SSD devices now use an erase block size over 1 MB. If you
-have such a device we suggest that you partition the drive in advance, using
-an alternative partitioning tool like <emphasis
-role="bold">gparted</emphasis>, and to use the following settings:</para>
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/exitInstall.xml b/docs/docs/stable/installer/zh_CN/exitInstall.xml
index bd404105..61199b75 100644
--- a/docs/docs/stable/installer/zh_CN/exitInstall.xml
+++ b/docs/docs/stable/installer/zh_CN/exitInstall.xml
@@ -5,19 +5,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">您以完成安装和配置 Mageia，现在可以安全地移除安装介质并重新启动。</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems (if there are more than one) on your computer.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">若您没有调整引导器的配置，将会自动启动 Mageia。</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Enjoy!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">若您有任何疑问，或希望帮助完善 Mageia，请访问 www.mageia.org。</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/firewall.xml b/docs/docs/stable/installer/zh_CN/firewall.xml
index f792c613..7e8238e1 100644
--- a/docs/docs/stable/installer/zh_CN/firewall.xml
+++ b/docs/docs/stable/installer/zh_CN/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="zh_CN">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="zh_CN" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">Firewall</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">Firewall</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
   <para>In the default setting (no button is checked), no service of the system is
-accessible from the network. The <emphasis role="bold">Everything (no
-firewall)</emphasis> enables access to all services of the machine - an
-option that does not make much sense in the context of the installer since
-it would create a totally unprotected system. Its veritable use is in the
-context of the Mageia Control Center (which uses the same GUI layout) for
-temporarily disabling the entire set of firewall rules for testing and
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
 debugging purposes.</para>
 
   <para>All other options are more or less self-explanatory. As an example, you will
-enable the <emphasis role="bold">CUPS server</emphasis> if you want printers
-on your machine to be accessible from the network.</para>
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where
-you can enable a series of services by typing a list of couples (blank
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
diff --git a/docs/docs/stable/installer/zh_CN/formatPartitions.xml b/docs/docs/stable/installer/zh_CN/formatPartitions.xml
index a59ddf3b..d19b3e93 100644
--- a/docs/docs/stable/installer/zh_CN/formatPartitions.xml
+++ b/docs/docs/stable/installer/zh_CN/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="zh_CN">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">格式化</title>
   </info>
@@ -11,30 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
 partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">一般情况下，DrakX 自动选择的分区需要被格式化。</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">可以点击 <guibutton>高级</guibutton> 来选择您要检查<emphasis>坏块</emphasis>的分区。</para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen,
-where you can choose to view details of your partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">若您确定选项正确，请点击<guibutton>下一页</guibutton>继续。</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/graphicalConfiguration.xml b/docs/docs/stable/installer/zh_CN/graphicalConfiguration.xml
new file mode 100644
index 00000000..c03c6e97
--- /dev/null
+++ b/docs/docs/stable/installer/zh_CN/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/installUpdates.xml b/docs/docs/stable/installer/zh_CN/installUpdates.xml
index c7bfb87a..9c7c2ccc 100644
--- a/docs/docs/stable/installer/zh_CN/installUpdates.xml
+++ b/docs/docs/stable/installer/zh_CN/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="zh_CN">
-  <info>
-    <title xml:id="installUpdates-ti1">更新</title>
-  </info>
+  
 
   
 
@@ -11,19 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">更新</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">在此版本的 <application>Mageia</application> 发布之后，一些软件包将会被更新或改善。</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them,
-select <guilabel>No</guilabel> if you don't want to do this now, or if you
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
 aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Press <guibutton>Next</guibutton> to continue</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/installer.xml b/docs/docs/stable/installer/zh_CN/installer.xml
index 7dd32d1f..1f79636e 100644
--- a/docs/docs/stable/installer/zh_CN/installer.xml
+++ b/docs/docs/stable/installer/zh_CN/installer.xml
@@ -6,160 +6,162 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
-  <info>
-    <title xml:id="installer-ti1">DrakX，Mageia 的安装器</title>
-  </info>
+  
 
-  <para>无论您是刚接触 GNU-Linux 的新人，还是老手，Mageia 安装器都能帮您轻松安装或升级系统。</para>
+  
 
-  <para>初始页中有很多选项，安装器将会选择其中的默认项（一般是您所需的）。</para>
+  
 
-  <section>
-    <title>安装欢迎屏幕</title>
+  
 
-    <section>
-      <title>Using a Mageia DVD</title>
+  
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+  
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+  
 
-      <para>From this screen, you have access to options by pressing "<emphasis
-role="bold">e</emphasis>" to enter the edit mode. To come back to this
-screen, press either <emphasis role="bold">Esc</emphasis> key to quit
-without saving or press the key <emphasis role="bold">Ctrl</emphasis> or
-<emphasis role="bold">F10</emphasis> to quit with saving.</para>
+  
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, it is possible to set some preferences (note that the
-options <emphasis role="bold">F1</emphasis> to <emphasis
-role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist>
-          <listitem>
-            <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis
-role="bold">F6</emphasis> options, you can view relevant help by pressing
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a
-specific language for the installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>If needed, change the screen resolution by pressing <emphasis
-role="bold">F3</emphasis> (Legacy mode only).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis role="bold">F6</emphasis> <emphasis
-role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis
-role="bold">e</emphasis> instead).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Default: It doesn't alter anything in the default options.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: Priority is given to the safer options at the price of a
-performance detriment.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI: (Advanced Configuration and Power Interface): Power management
-features are not used.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU
-interrupt. Select this option if you experience system misbehaviour like a
-kernel panic in relation to APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>若选择了这些选项之一，将会同时更改<guilabel>引导选项</guilabel>行中的默认选项。</para>
-
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with
-<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot
-Options</guilabel> line, despite this, they will in fact be applied.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various
-boot options. Select an item with the arrow keys and press <emphasis
-role="bold">Enter</emphasis> for more details or press <emphasis
-role="bold">Esc</emphasis> to go back to the welcome screen.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>The detailed view about the splash option. Press <emphasis
-role="bold">Esc</emphasis> or select <guilabel>Return to Boot
-Options</guilabel> to go back to the options list. These options can be
-added by hand in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>有关传统引导和 UEFI 引导的内核选项，请参考：<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>。</para>
-          </listitem>
-        </itemizedlist></para>
-    </section>
-  </section>
+  
+
+  
+
+  <info>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX，Mageia 的安装器</title>
+  </info>
+
+  <para>无论您是刚接触 GNU-Linux 的新人，还是老手，Mageia 安装器都能帮您轻松安装或升级系统。</para>
 
   <section>
     <title>安装步骤</title>
 
-    <para>The install process is divided into a number of steps, the status of which
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
 is indicated in a panel to the left of the screen.</para>
+      </listitem>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
 options.</para>
+      </listitem>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
 about the particular step.</para>
+      </listitem>
+    </itemizedlist>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
 is possible to reboot, but please think twice before you do this. Once a
 partition has been formatted or updates have started to be installed, your
 computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
+
+  <section>
+    <title>安装欢迎屏幕</title>
+
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
+
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
+
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
+
+      <itemizedlist>
+        <title>Menu</title>
+
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section>
+      <title>UEFI Systems</title>
+
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
+
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
+
+      <itemizedlist>
+        <title>Menu</title>
+
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -170,18 +172,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>在初始屏幕之后，可能无法显示语言选择窗口。这中情况可能发生在部分显卡和较老的系统中。请尝试在提示后输入 <code>vgalo</code>
-来切换到较低分辨率。</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this press <emphasis role="bold">Esc</emphasis> at the first welcome screen
-and confirm with <emphasis role="bold">ENTER</emphasis>. You will be
-presented with a black screen with the word "boot:". Type "text" and press
-<emphasis role="bold">ENTER</emphasis> to continue with the installation in
-text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -189,8 +193,11 @@ text mode.</para>
     <section>
       <title>安装停止</title>
 
-      <para>若系统在安装过程中停止响应（卡死），可能是硬件检测过程出现问题。在这种情况下，可以先跳过硬件检测过程：在命令提示后输入
-<code>noauto</code>。此选项也可以与其他选项联合使用。</para>
+      <para>If the system appeared to freeze during the installation, this may be a
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -198,17 +205,18 @@ text mode.</para>
 
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>动态分区</title>
 
-      <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis>
-format to <emphasis role="bold">dynamic</emphasis> format in Microsoft
-Windows, then it is not possible to install Mageia on this disc. To revert
-to a basic disk, see the Microsoft documentation: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/zh_CN/locale.xml b/docs/docs/stable/installer/zh_CN/locale.xml
new file mode 100644
index 00000000..719ae39b
--- /dev/null
+++ b/docs/docs/stable/installer/zh_CN/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/login.xml b/docs/docs/stable/installer/zh_CN/login.xml
index 25b811f4..e4bc9b43 100644
--- a/docs/docs/stable/installer/zh_CN/login.xml
+++ b/docs/docs/stable/installer/zh_CN/login.xml
@@ -1,3 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="zh_CN"><info><title xml:id="label-to-adapt-ti1">登录界面</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM 登录界面</para></caption></mediaobject><para>最后，您将会看到登录界面。</para><para>请输入您的用户名和密码，随后您将看到 KDE 或 GNOME 桌面（根据您所选的安装介质而异）。您现在即可使用 Mageia 系统。</para><para>可以在 <link linkend="https://wiki.mageia.org/en/Category:Documentation">Mageia
-wiki</link> 中找到有关系统使用的方法。</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="zh_CN">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/media_selection.xml b/docs/docs/stable/installer/zh_CN/media_selection.xml
index 931daa8a..12ced028 100644
--- a/docs/docs/stable/installer/zh_CN/media_selection.xml
+++ b/docs/docs/stable/installer/zh_CN/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="zh_CN">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">介质选择 (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>此处列出了可用的仓库。根据所选的安装介质，并非所有仓库都可以使用。所选仓库将决定下一步中可用的软件包。</para>
 
@@ -28,8 +37,11 @@ align="center" revision="1" fileref="dx2-media_selection.png"/>
     </listitem>
 
     <listitem>
-      <para><emphasis>Nonfree</emphasis> 仓库包含了免费（因此Mageia可以再分发）、但不开源的软件。例如，此仓库包含 nVidia
-和 ATI 的私有显卡驱动、各类 WiFi 网卡的固件等。</para>
+      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
+free-of-charge, i.e. Mageia may redistribute them, but they contain
+closed-source software (hence the name - Nonfree). For example this
+repository includes nVidia and AMD graphics card proprietary drivers,
+firmware for various WiFi cards, etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/zh_CN/minimal-install.xml b/docs/docs/stable/installer/zh_CN/minimal-install.xml
index 8a5b7207..bca0ba81 100644
--- a/docs/docs/stable/installer/zh_CN/minimal-install.xml
+++ b/docs/docs/stable/installer/zh_CN/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="zh_CN">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="zh_CN">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">最小安装</title>
   </info>
@@ -10,29 +13,44 @@
 
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
-  <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+  
 
-  <para>Minimal Installation is intended for those with specific uses in mind for
-<application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the <emphasis
-role="bold">Individual package selection</emphasis> option mentioned above,
-to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>If you choose this installation method, then the relevant screen will offer
-you a few useful extras to install, such as documentation and X.</para>
+  
 
-  <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
 lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para>一些基础的文档由 man 和 info 命令提供。其中包含了来自 <link
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
-Project</link> 的 man 帮助页和来自 <link
+Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
-coreutils</link> 的 info 帮助页。</para>
+coreutils</link> info pages.</para>
 
   <mediaobject>
 <imageobject> <imagedata format="PNG" xml:id="minimal-install-im1"
diff --git a/docs/docs/stable/installer/zh_CN/misc-params.xml b/docs/docs/stable/installer/zh_CN/misc-params.xml
index 08e3d08b..8d54e72e 100644
--- a/docs/docs/stable/installer/zh_CN/misc-params.xml
+++ b/docs/docs/stable/installer/zh_CN/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">一些杂项</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
 
   <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
 the choices you made and on the hardware detected. You can check the
 settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>As a general rule, it is recommended that you accept the default settings
@@ -26,7 +42,7 @@ unless:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>some other factor mentionned in the detailed sections below is an issue.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,44 +54,47 @@ unless:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>时区</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
 can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>国家/地区</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
 setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>引导器</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX 为引导器进行了自动设置。</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">更多信息，参见 <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>用户管理</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">您可以在此处添加额外的用户。将会为每个用户在 <literal>/home</literal> 下创建目录。</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>服务</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
 (daemons).  This tool allows you to enable or disable certain processes.</para>
 
-        <para xml:id="misc-params-system-pa6b" revision="1">在做出更改之前，请认真审视选项 - 任何错误都可能导致系统无法正常运行。</para>
-
-        <para>更多信息，参见 <xref linkend="configureServices"/>.</para>
+        <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -87,7 +106,7 @@ setting.  See <xref linkend="selectCountry"/></para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>键盘</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
 of keyboard.</para>
@@ -98,26 +117,31 @@ of keyboard.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>鼠标</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">您可以添加或配置其他触控设备、平板、轨迹球等。</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>声卡</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The
-option to select a different driver is only given when there is more than
-one driver for your card, but where none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>图形界面</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">您可以在这里配置显卡和显示器。</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">更多信息，参见 <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -132,11 +156,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>网络</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, using the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
@@ -146,12 +170,14 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>代理</guilabel>：</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
-        <para xml:id="misc-params-network-pa4a" revision="1">代理服务器将作为您的电脑和广域网之间的桥梁。您可以在此处配置您需要使用的代理服务。</para>
+        <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
+Internet.  This section allows you to configure your computer to utilize a
+proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -163,22 +189,31 @@ need to enter here.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>安全等级</guilabel>：</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">您可以在这里设置计算机的安全等级，一般情况下可以使用默认设置（标准）。</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">请勾选您认为合适的选项。</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>防火墙</guilabel>：</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">防火墙将保护您的重要数据，以免其被他人恶意利用或窃取。</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">选择您需要使用的服务，这取决与您希望如何使用您的计算机。有关更多信息，请参见 <xref linkend="firewall"/>。</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">请牢记：允许所有服务（即不启用防火墙）是非常危险的。</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/zh_CN/reboot.xml b/docs/docs/stable/installer/zh_CN/reboot.xml
index 1af1db3d..c09a7482 100644
--- a/docs/docs/stable/installer/zh_CN/reboot.xml
+++ b/docs/docs/stable/installer/zh_CN/reboot.xml
@@ -1,15 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="zh_CN" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">重新启动</title>
   </info>
   
-  <para>一旦安装了引导器，安装程序将会提示您重启电脑，此时请移除 Live CD 并重启。请点击<emphasis
-role="bold"><guibutton>完成</guibutton></emphasis>并<emphasis
-role="bold">根据提示的步骤</emphasis>进行操作。</para>
+  
+  <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>重启后，您将会看到一系列下载进度条，它将提示您正在下载的软件媒体（参见“软件管理”）。</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/zh_CN/securityLevel.xml b/docs/docs/stable/installer/zh_CN/securityLevel.xml
index 3c889df0..1b65a1da 100644
--- a/docs/docs/stable/installer/zh_CN/securityLevel.xml
+++ b/docs/docs/stable/installer/zh_CN/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">安全级别</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended
-setting for the average user. The <emphasis role="bold">Secure</emphasis>
-setting will create a highly protected system - for instance if the system
-is to be used as a public server.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Security Administrator</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
 which require notification to a system administrator.</para>
 
-  <para>A good, and easy-to-implement, choice is to enter &lt;user>@localhost -
-where &lt;user> is the login name of the user to receive these messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
 be configured for receiving such mail!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/selectCountry.xml b/docs/docs/stable/installer/zh_CN/selectCountry.xml
index e7175780..8d7877d7 100644
--- a/docs/docs/stable/installer/zh_CN/selectCountry.xml
+++ b/docs/docs/stable/installer/zh_CN/selectCountry.xml
@@ -1,25 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="zh_CN">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="zh_CN">
   <info>
     <title xml:id="selectCountry-ti1">选择您所在的国家/地区</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">请选择您所在的国家或地区。此选项将影响货币设置和无线管理域设置。如果您设置了错误的国家，您可能无法正常使用无线网络。</para>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
+like the currency and wireless regulatory domain. Setting the wrong country
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> option and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem that a country from the
-first list was chosen. Please ignore this, as DrakX will apply your actual
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -27,7 +40,7 @@ choice.</para>
       <title xml:id="inputMethod-ti7">输入法</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
@@ -37,9 +50,9 @@ selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via <emphasis role="bold">Configure
-your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
-running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/selectInstallClass.xml b/docs/docs/stable/installer/zh_CN/selectInstallClass.xml
index b26ed4ab..29f9e45d 100644
--- a/docs/docs/stable/installer/zh_CN/selectInstallClass.xml
+++ b/docs/docs/stable/installer/zh_CN/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="zh_CN" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">新安装或升级</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>安装</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option to perform a fresh installation of
-<application>Mageia</application>. This will format the root partition (/),
-but can preserve a separated /home partition.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>升级</para>
-
-      <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that has reached
-its End Of Life, then it is better to do a clean install instead while
-preserving your <literal>/home</literal> partition.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that, and only if you are very sure
-rebooting is what you want, go to a text terminal by pressing <guilabel>Alt
-Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the <emphasis role="bold">Install or Upgrade</emphasis>
-screen to the language choice screen by pressing <guilabel>Alt Ctrl
-Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do
-this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/selectKeyboard.xml b/docs/docs/stable/installer/zh_CN/selectKeyboard.xml
index fb02eeb4..6e1888d3 100644
--- a/docs/docs/stable/installer/zh_CN/selectKeyboard.xml
+++ b/docs/docs/stable/installer/zh_CN/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="zh_CN">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,39 +19,41 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">键盘</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX 会根据您的语言为您选择合适的键盘。若找不到合适的键盘，则会自动选择美式键盘。</para>
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX 会根据您的语言为您选择合适的键盘。若找不到合适的键盘，则会自动选择美式键盘。</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">请确保该选项正确。如果您不知道您的键盘肿瘤，请查阅您的电脑配件规格，或询问电脑供应商，或查看键盘上的标签。您也可以参考这里的内容：<link
+      <para revision="1" xml:id="selectKeyboard-pa2">请确保该选项正确。如果您不知道您的键盘肿瘤，请查阅您的电脑配件规格，或询问电脑供应商，或查看键盘上的标签。您也可以参考这里的内容：<link
 xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/Keyboard_layout</link></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a fuller list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this and
-continue the installation: the keyboard chosen from the full list will be
-applied.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
 extra dialogue screen asking how you would prefer to switch between the
 Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/selectKeyboardLive.xml b/docs/docs/stable/installer/zh_CN/selectKeyboardLive.xml
index e62917c1..eac80ab8 100644
--- a/docs/docs/stable/installer/zh_CN/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/zh_CN/selectKeyboardLive.xml
@@ -1,12 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">选择键盘</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
 
-  <para>您需要选择在 Mageia 中使用的键盘布局。默认布局已根据您之前的语言和时区设置进行选择。</para>
-</section>
\ No newline at end of file
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/selectLanguage.xml b/docs/docs/stable/installer/zh_CN/selectLanguage.xml
index 7a3721f0..6ebd8463 100644
--- a/docs/docs/stable/installer/zh_CN/selectLanguage.xml
+++ b/docs/docs/stable/installer/zh_CN/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_CN" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,46 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">请选择要使用的语言</title>
   </info>
 
-  <para condition="classical">请在地区列表中选择您的首选语言。<application>Mageia</application> 将会在之后的安装过程中使用该语言。</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">If it is likely that you (or others) will require several languages to be
-installed on your system, then you should use the <guibutton>Multiple
-languages</guibutton> option to add them now. It will be difficult to add
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
 extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
+  <important condition="classical">
     <para>Even if you choose more than one language, you must first choose one as your
-preferred language in the first language screen. It will also be marked as
-chosen in the multiple languages screen.</para>
-  </warning>
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
-      <para>若您的键盘输入语言与首选语言不同，最好也同时安装该输入语言。</para>
+      <para>If your keyboard language is not the same as your preferred language, then
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia 默认使用 UTF-8（Unicode）格式。</para>
-
-      <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple
-languages</emphasis> screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>您可以在安装完成后，在 Mageia 控制中心 -> 系统 -> 管理本地化 中改变系统语言。</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/selectMouse.xml b/docs/docs/stable/installer/zh_CN/selectMouse.xml
index b7eea67c..2d9662c3 100644
--- a/docs/docs/stable/installer/zh_CN/selectMouse.xml
+++ b/docs/docs/stable/installer/zh_CN/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="zh_CN">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">选择鼠标</title>
   </info>
@@ -7,23 +13,28 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">若您对鼠标的响应速度不满意，可以在这里进行调整。</para>
 
- <para revision="2" xml:id="selectMouse-pa2">一般而言，<guilabel>通用</guilabel> - <guilabel>任意 PS/2 和 USB
-鼠标</guilabel>可以满足大多数需求。</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">选择 <guilabel>通用</guilabel> - <guilabel>强制 evdev</guilabel> 可用于配置超过五键的鼠标。</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/zh_CN/setupBootloader.xml b/docs/docs/stable/installer/zh_CN/setupBootloader.xml
index b4232fa9..1ac4b307 100644
--- a/docs/docs/stable/installer/zh_CN/setupBootloader.xml
+++ b/docs/docs/stable/installer/zh_CN/setupBootloader.xml
@@ -1,144 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="zh_CN" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="zh_CN" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">引导程序的主要选项</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>引导器界面</title>
-    <para>默认情况下，Mageia 仅使用：</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot
-choose between the <emphasis role="bold">with</emphasis> or <emphasis
-role="bold">without graphical menu</emphasis> options.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to house the bootloader
-(GRUB2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds GRUB2-efi. Although it is possible to have
-several ESPs, only one is required (and advised), whatever the number of
-operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">使用 Mageia 提供的引导器</title>
-    <para>By default, and according to your system, Mageia writes one of the
-following:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then untick the <emphasis
-role="bold">Probe Foreign OS</emphasis> option.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
   <section>
-    <title>使用现存的引导器</title>
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this documentation, however in most cases it will
-involve running the relevant bootloader installation program which should
-detect and add it automatically. See the documentation for the operating
-system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">使用链式加载（chain loading）</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>安装程序将会提醒您缺少引导器，请忽略它并点击<guibutton>确定</guibutton>。</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-  <section>
-    <title>选项</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>第一页</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you
-set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be required when booting
-to select a booting entry or change settings. The username is <emphasis
-role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will
-check that it matches with the one above.</para></listitem><listitem><para><guilabel>高级</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for power management. It can save energy by
-stopping unused devices.  Deselecting it could be useful if, for example,
-your computer does not support ACPI or if you think the ACPI implementation
-might cause some problems (for instance random reboots or system lockups).</para></listitem><listitem><para><guilabel>Enable SMP</guilabel>: This option enables/disables symmetric
-multiprocessing for multi core processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the operating system access to
-the Advanced Programmable Interrupt Controller. APIC devices permit more
-complex priority models, and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC manages all external
-interrupts for a specific processor in an SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>引导程序的主要选项</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>下一页</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>默认</guilabel>：使用默认引导参数</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>追加</guilabel> ：用于在默认引导选项后添加额外所需的内核参数。</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>探测其他系统</guilabel>：参见<link linkend="setupMageiaBootloader">使用
-Mageia 引导器</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>高级</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-to be used by the boot menu. If you click the down triangle you will be
-offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">不要修改 ESP 或 MBR</emphasis>：参见<link
-linkend="setupChainLoading">使用链式加载</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>使用现存的引导器</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>添加或修改引导菜单项</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/setupSCSI.xml b/docs/docs/stable/installer/zh_CN/setupSCSI.xml
index 0005b943..590f509b 100644
--- a/docs/docs/stable/installer/zh_CN/setupSCSI.xml
+++ b/docs/docs/stable/installer/zh_CN/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="zh_CN">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">设置SCSI</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
 SCSI controllers it may be unable to determine the correct drivers to use
 and subsequently fail to recognise the drive.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s)
-you have.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">随后 DrakX 应当能正确配置这些驱动器。</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/software.xml b/docs/docs/stable/installer/zh_CN/software.xml
new file mode 100644
index 00000000..62f17a67
--- /dev/null
+++ b/docs/docs/stable/installer/zh_CN/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="zh_CN" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_CN/soundConfig.xml b/docs/docs/stable/installer/zh_CN/soundConfig.xml
index ff41cfba..5a13d91d 100644
--- a/docs/docs/stable/installer/zh_CN/soundConfig.xml
+++ b/docs/docs/stable/installer/zh_CN/soundConfig.xml
@@ -1,37 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="zh_CN">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">声音配置</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if one exists.</para>
+  
 
-  <para>默认驱动通常不会出问题。不过，如果您在安装后遇到问题，请运行 <command>draksound</command>，或通过 MCC（Mageia
-控制中心）中<guilabel>硬件</guilabel>选项卡中的<guilabel>声音配置</guilabel>来启动 draksound。</para>
+  
 
-  <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis
-role="bold">Sound Configuration</emphasis> tool screen, click on
-<guibutton>Troubleshooting</guibutton> to find useful advice about how to
-solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">高级</title>
     </info>
 
-    <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in
-this screen, during install, is useful if there is no default driver and
-there are several drivers available, but you think the installer selected
-the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on <emphasis
-role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/takeOverHdConfirm.xml b/docs/docs/stable/installer/zh_CN/takeOverHdConfirm.xml
index 73a062f7..8f04da8f 100644
--- a/docs/docs/stable/installer/zh_CN/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/zh_CN/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="zh_CN">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">确定要格式化的硬盘</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is
-ok to erase every partition, every operating system and all data that might
-be on that hard disk.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/testing.xml b/docs/docs/stable/installer/zh_CN/testing.xml
index d0b01db6..238e97c2 100644
--- a/docs/docs/stable/installer/zh_CN/testing.xml
+++ b/docs/docs/stable/installer/zh_CN/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">以 Live 模式运行 Mageia</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">以 Live 模式运行 Mageia</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,19 +17,20 @@
       <title xml:id="testing1-ti1">Live 模式</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>如果选择了“引导Mageia”，您将看到此界面。如果没有，你将看到“<link
-linkend="doPartitionDisks">分区</link>”界面。</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">测试硬件</title>
       </info>
 
-      <para>Live 模式的目的在于测试硬件是否被 Mageia 正确管理。您可以在 Mageia
-控制中心中检查所有设备是否均有对应驱动程序。您可以测试最新的设备：</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -34,11 +38,7 @@ linkend="doPartitionDisks">分区</link>”界面。</para>
         </listitem>
 
         <listitem>
-          <para>显卡：若您能看见刚才的界面，说明配置正常。</para>
-        </listitem>
-
-        <listitem>
-          <para>摄像头：</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -46,7 +46,7 @@ linkend="doPartitionDisks">分区</link>”界面。</para>
         </listitem>
 
         <listitem>
-          <para>打印机：配置打印机，并打印测试页</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -54,9 +54,13 @@ linkend="doPartitionDisks">分区</link>”界面。</para>
         </listitem>
       </itemizedlist>
 
-      <para>如果一切就绪，安装现在即可开始；反之，您可以点击退出按钮。</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>此处您的配置将保留并用于安装过程。</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -64,12 +68,14 @@ linkend="doPartitionDisks">分区</link>”界面。</para>
         <title xml:id="testing3-ti1">启动安装</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>要使用 Mageia LiveCD 或 LiveDVD 来安装系统至硬盘/SSD，只需点击“安装至硬盘”图标。随后您将会看见此界面，然后点击“<link
-linkend="doPartitionDisks">分区</link>”并直接进入安装过程。</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/zh_CN/uninstall-Mageia.xml b/docs/docs/stable/installer/zh_CN/uninstall-Mageia.xml
index 2ab99894..ec5b6b39 100644
--- a/docs/docs/stable/installer/zh_CN/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/zh_CN/uninstall-Mageia.xml
@@ -1,29 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="zh_CN">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_CN" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">卸载Mageia</title>
   </info>
 
   
 
+  
+
   <para>If Mageia didn't convince you or you can't install it correctly - in short
 you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-  <para>After your data backup, reboot your Mageia installation DVD and select
-<emphasis role="bold">Rescue system</emphasis>, then, <emphasis
-role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
-will only have Windows, with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>In Windows to recover the space used by Mageia partitions: click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code>. You will recognize a Mageia partition
-because they are labeled <guilabel>Unknown</guilabel>, and also by their
-size and place on the disk. Right click on each of these partitions and
-select <guibutton>Delete</guibutton> to free up the space.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
-  <para>若您安装了 Windows XP，您可以使用空闲空间创建一个新分区并格式化它（FAT32 或 NTFS），系统将自动为其分配一个盘符。</para>
+  <para>If you are using Windows XP, you can create a new partition and format it
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>If you have Vista or 7, you have one more possibility, you can extend the
 existing partition that is at the left of the freed space. There are other
@@ -31,4 +45,4 @@ partitioning tools that can be used, such as <emphasis
 role="bold">gparted</emphasis>, available for both Windows and Linux. As
 always, when changing partitions, be very careful to back up anything
 important to you.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_CN/unused.xml b/docs/docs/stable/installer/zh_CN/unused.xml
index b105c0c8..04526967 100644
--- a/docs/docs/stable/installer/zh_CN/unused.xml
+++ b/docs/docs/stable/installer/zh_CN/unused.xml
@@ -1,23 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="zh_CN" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="zh_CN">
   <info>
     <title xml:id="unused-ti1">保留或删除未使用的软件</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
+
+  <para>In this step, the installer looks for unused locales packages and unused
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
 
-  <para>在这一步中，安装程序将会查找未使用的语言包和硬件包，并将其删除。除非您需要在不同的硬件上运行系统，否则最好允许此操作。</para>
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>下一步是复制文件到硬盘。这需要花费几分钟的时间。之后，您的屏幕会变黑一段时间，这是正常现象。</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>
diff --git a/docs/docs/stable/installer/zh_TW/DrakLive-cover.xml b/docs/docs/stable/installer/zh_TW/DrakLive-cover.xml
index 44e13410..3a9a4251 100644
--- a/docs/docs/stable/installer/zh_TW/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/zh_TW/DrakLive-cover.xml
@@ -1,76 +1,104 @@
-<?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="zh_TW" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<book version="5.0" xml:lang="zh_TW" xml:id="DrakLive-installer"
+      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">
+  
+
+  
+
   <info>
-    <title>Installation from LIVE medium</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>January 2015</date>
+    <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
+<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<title>Installation from LIVE medium</title>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>March 2016</date>
+
         <revremark>Mageia 5</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageia的官方文件</para>
+      <para role="tagline">Mageia的官方文件</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
+<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://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="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> 
+Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
+
   <article>
     <title>Installation from LIVE medium</title>
-       <para><note>
-          <para>No one will see all the installer screens that you see in this manual. Which
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
 screens you will see, depends on your hardware and the choices you make
 while installing.</para>
-        </note></para>
-  <xi:include href="SelectAndUseISOs2.xml"/>
+      </note></para>
+
+    <xi:include href="SelectAndUseISOs2.xml"/>
+
+    <xi:include href="bootLive.xml"/>
+
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="bootLive.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="bestTime.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+    <xi:include href="selectKeyboardLive.xml"/>
 
-  <xi:include href="bestTime.xml"/>
+    <xi:include href="testing.xml"/>
 
-  <xi:include href="selectKeyboardLive.xml"/>
+    <xi:include href="diskPartitioning.xml"/>
 
-  <xi:include href="testing.xml"/>
+    
 
-  <xi:include href="doPartitionDisks.xml"/>
+    <!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="ask_mntpoint_s.xml"/>
 
-  <xi:include href="diskdrake.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+    <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="unused.xml"/>
+    <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+    <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    
 
-  <xi:include href="reboot.xml"/>
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
-  <xi:include href="addUser.xml"/>
+    <xi:include href="addUser.xml"/>
 
-  <xi:include href="login.xml"/>
+    <xi:include href="login.xml"/>
 
-  <xi:include href="uninstall-Mageia.xml"/>
- </article>
-</book>
\ No newline at end of file
+    <xi:include href="uninstall-Mageia.xml"/>
+  </article>
+</book>
diff --git a/docs/docs/stable/installer/zh_TW/DrakLive.xml b/docs/docs/stable/installer/zh_TW/DrakLive.xml
index d45a5253..61c6e540 100644
--- a/docs/docs/stable/installer/zh_TW/DrakLive.xml
+++ b/docs/docs/stable/installer/zh_TW/DrakLive.xml
@@ -1,6 +1,21 @@
-<?xml version='1.0' encoding='utf-8'?><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="zh_TW" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+<article version="5.0" xml:lang="zh_TW" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
   <info>
-    <title>Installation from LIVE medium</title>
+    <!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
+<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml 
+b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
+<title>Installation from LIVE medium</title>
 
     <cover>
       <para><note>
@@ -17,7 +32,7 @@ ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons
 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
+      <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>
@@ -39,7 +54,12 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="testing.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  <xi:include href="diskPartitioning.xml"/>
+
+  
+
+  <!-- <xi:include href="doPartitionDisks.xml"/>
+
 
   <xi:include href="ask_mntpoint_s.xml"/>
 
@@ -49,17 +69,18 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="formatPartitions.xml"/>
 
-  <xi:include href="unused.xml"/>
-
-  <xi:include href="setupBootloader.xml"/>
+  <xi:include href="unused.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  
 
-  <xi:include href="reboot.xml"/>
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<xi:include href="reboot.xml"/>
 
   <xi:include href="addUser.xml"/>
 
   <xi:include href="login.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/zh_TW/DrakX-cover.xml b/docs/docs/stable/installer/zh_TW/DrakX-cover.xml
index 26e54e5a..4542c6ff 100644
--- a/docs/docs/stable/installer/zh_TW/DrakX-cover.xml
+++ b/docs/docs/stable/installer/zh_TW/DrakX-cover.xml
@@ -1,115 +1,154 @@
-<?xml version='1.0' encoding='utf-8'?><!-- Converted by db4-upgrade version 1.0 -->
-<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="zh_TW" xml:id="Quick-Startup">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<book version="5.0" xml:lang="zh_TW" xml:id="Quick-Startup"
+      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 DrakX</title>
-   <publisher> <publishername>Mageia.org</publishername> </publisher>
-   <revhistory>
-     <revision>
-          <date>February 2014</date>
+
+    <publisher> <publishername>Mageia.org</publishername> </publisher>
+
+    <revhistory>
+      <revision>
+        <date>February 2014</date>
+
         <revremark>Mageia 4</revremark>
-     </revision>
-   </revhistory>
+      </revision>
+    </revhistory>
+
     <cover>
-        <para role="tagline">Mageia的官方文件</para>
+      <para role="tagline">Mageia的官方文件</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
+
+      <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://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="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> 
+Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
+
   <article>
-  
+    
 
+    
 
+    
 
+    
 
+    
 
-<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+    
+
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Installation with DrakX</title>
-       <para><note>
-          <para>No one will see all the installer screens that you see in this manual. Which
+
+    <para><note>
+        <para>No one will see all the installer screens that you see in this manual. Which
 screens you will see, depends on your hardware and the choices you make
 while installing.</para>
-        </note></para>
-  
-  
+      </note></para>
 
-  <!-- <xi:include href="drakx-intro.xml"/>
+    
+
+    <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
 
-  <xi:include href="installer.xml"/>
+    <xi:include href="installer.xml"/>
 
-  <xi:include href="selectLanguage.xml"/>
+    <xi:include href="selectLanguage.xml"/>
 
-  <xi:include href="acceptLicense.xml"/>
+    <xi:include href="acceptLicense.xml"/>
 
-  <xi:include href="setupSCSI.xml"/>
+    <xi:include href="setupSCSI.xml"/>
 
-  <xi:include href="selectInstallClass.xml"/>
+    <xi:include href="selectInstallClass.xml"/>
 
-  <xi:include href="selectKeyboard.xml"/>
+    <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+    
 
- 
+    
 
-  <!-- <xi:include href="resizeFATChoose.xml"/>
+    
 
+    <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
 
-<xi:include href="takeOverHdConfirm.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
+
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="add_supplemental_media.xml"/>
 
-<xi:include href="media_selection.xml"/>
+  <xi:include href="media_selection.xml"/>
 
-<xi:include href="chooseDesktop.xml"/>
+  <xi:include href="chooseDesktop.xml"/>
 
-<xi:include href="choosePackageGroups.xml"/>
+  <xi:include href="choosePackageGroups.xml"/>
 
-<xi:include href="minimal-install.xml"/>
+  <xi:include href="minimal-install.xml"/>
 
-<xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
 
-  
+    <xi:include href="software.xml"/>
+
+    
 
-  <!-- <xi:include href="setRootPassword.xml">
+    <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+    <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+    
 
-  <xi:include href="configureX_monitor.xml"/>
+    <!-- <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+    <xi:include href="configureX_chooser.xml"/>
 
-  
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
+
+    
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+    
+
+    <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -117,29 +156,32 @@ while installing.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-<xi:include href="configureTimezoneUTC.xml"/>
- 
-<xi:include href="selectCountry.xml"/>
+    <xi:include href="locale.xml"/>
 
-<xi:include href="configureServices.xml"/>
+    
+
+    <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-<xi:include href="selectMouse.xml"/>
 
-<xi:include href="soundConfig.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
-  <xi:include href="securityLevel.xml"/>
+    <xi:include href="selectMouse.xml"/>
 
-  <xi:include href="firewall.xml"/>
+    <xi:include href="soundConfig.xml"/>
 
+    <xi:include href="securityLevel.xml"/>
 
-  
+    <xi:include href="firewall.xml"/>
 
-  <!-- <xi:include href="configureNetwork.xml">
+    
+
+    <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
 
-  <xi:include href="exitInstall.xml"/>
-  
-  <xi:include href="uninstall-Mageia.xml"/>
+    <xi:include href="exitInstall.xml"/>
+
+    <xi:include href="uninstall-Mageia.xml"/>
   </article>
 </book>
diff --git a/docs/docs/stable/installer/zh_TW/DrakX-inline.xml b/docs/docs/stable/installer/zh_TW/DrakX-inline.xml
new file mode 100644
index 00000000..27d6d159
--- /dev/null
+++ b/docs/docs/stable/installer/zh_TW/DrakX-inline.xml
@@ -0,0 +1,138 @@
+<?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="zh_TW" xml:id="Quick-Startup">
+  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
+<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
+<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
+<!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <title>Installation with DrakX</title>
+
+    <cover>
+      <para><note>
+          <para>No one will see all the installer screens that you see in this manual. Which
+screens you will see, depends on your hardware and the 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>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>
+    </cover>
+  </info>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
+  <xi:include href="installer.xml"/>
+
+  <xi:include href="selectLanguage.xml"/>
+
+  <xi:include href="acceptLicense.xml"/>
+
+  <xi:include href="setupSCSI.xml"/>
+
+  <xi:include href="selectInstallClass.xml"/>
+
+  <xi:include href="selectKeyboard.xml"/>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  
+
+  <!-- <xi:include href="resizeFATChoose.xml"/>
+
+
+  <xi:include href="takeOverHdChoose.xml"/> -->
+<xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+
+  <xi:include href="add_supplemental_media.xml"/>
+
+  <xi:include href="media_selection.xml"/>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+
+  
+
+  <!-- <xi:include href="setRootPassword.xml">
+</xi:include> -->
+<xi:include href="addUser.xml"/>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+
+  <xi:include href="setupBootloader.xml"/>
+
+  <xi:include href="setupBootloaderAddEntry.xml"/>
+
+  
+
+  <!-- <xi:include href="setupYabootGeneral.xml">
+</xi:include>
+  
+  <xi:include href="setupYabootAddEntry.xml"></xi:include>
+  
+  <xi:include href="summary.xml"></xi:include> -->
+<xi:include href="misc-params.xml"/>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+
+  <xi:include href="configureServices.xml"/>
+
+  <xi:include href="selectMouse.xml"/>
+
+  <xi:include href="soundConfig.xml"/>
+
+  <xi:include href="securityLevel.xml"/>
+
+  
+
+  <!-- <xi:include href="configureNetwork.xml">
+</xi:inclu de> -->
+<xi:include href="installUpdates.xml"/>
+
+  <xi:include href="exitInstall.xml"/>
+
+  <xi:include href="uninstall-Mageia.xml"/>
+</article>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/DrakX.xml b/docs/docs/stable/installer/zh_TW/DrakX.xml
index d7f15e78..29bd1c0f 100644
--- a/docs/docs/stable/installer/zh_TW/DrakX.xml
+++ b/docs/docs/stable/installer/zh_TW/DrakX.xml
@@ -1,15 +1,53 @@
-<?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="zh_TW" xml:id="Quick-Startup">
-  <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Converted by db4-upgrade version 1.0 -->
+<article version="5.0" xml:lang="zh_TW" xml:id="Quick-Startup"
+         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">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+  <!-- <xi:include href="drakx-intro.xml"/>
+ -->
+<info>
+    <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
 <!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
-<!-- <xi:include href="drakx-intro.xml"/>
- -->
-<info>
-    <title>Installation with DrakX</title>
+<!--2018/02/16 apb: 1st run towards improving Mga7 DrakX manual - Text and typography done for all required xml's.
+  Also, removed the inclusion for setupBootladerAddEntry (was section 24) as I have appended it to the end of section 23 (Bootloader).-->
+<!--2018/02/23 apb: Disabled Include for configureX_card_list.xml & configureX_monitor.xml because there is no point to them being Siblings to configureX_chooser.xml (Graphic Card and Monitor Configuration). They are really Children.-->
+<!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
+  b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
+<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
+<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<title>Installation with DrakX</title>
 
     <cover>
       <para><note>
@@ -34,18 +72,6 @@ Team</link>, if you would like to help improve this manual.</para>
 
   
 
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
   <xi:include href="SelectAndUseISOs2.xml"/>
 
   <xi:include href="installer.xml"/>
@@ -60,23 +86,28 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="selectKeyboard.xml"/>
 
-  <xi:include href="doPartitionDisks.xml"/>
+  
+
+  
 
   
 
   <!-- <xi:include href="resizeFATChoose.xml"/>
+ -->
+<!-- <xi:include href="doPartitionDisks.xml"/>
 
 
-  <xi:include href="takeOverHdChoose.xml"/> -->
-<xi:include href="ask_mntpoint_s.xml"/>
+  <xi:include href="ask_mntpoint_s.xml"/>
+  
+  <xi:include href="takeOverHdChoose.xml"/>
 
-  <xi:include href="takeOverHdConfirm.xml"/>
+    <xi:include href="takeOverHdConfirm.xml"/>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/>-->
+<!-- <xi:include href="add_supplemental_media.xml"/>
 
-  <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
 
@@ -86,7 +117,10 @@ Team</link>, if you would like to help improve this manual.</para>
 
   <xi:include href="minimal-install.xml"/>
 
-  <xi:include href="choosePackagesTree.xml"/>
+  <xi:include href="choosePackagesTree.xml"/> -->
+<xi:include href="diskPartitioning.xml"/>
+
+  <xi:include href="software.xml"/>
 
   
 
@@ -94,19 +128,25 @@ Team</link>, if you would like to help improve this manual.</para>
 </xi:include> -->
 <xi:include href="addUser.xml"/>
 
-  <xi:include href="configureX_chooser.xml"/>
+  <xi:include href="graphicalConfiguration.xml"/>
 
-  <xi:include href="configureX_card_list.xml"/>
+  
 
-  <xi:include href="configureX_monitor.xml"/>
+  <!-- <xi:include href="configureX_chooser.xml"/>
 
-  <xi:include href="setupBootloader.xml"/>
+  
+  <xi:include href="configureX_card_list.xml"/>
 
-  <xi:include href="setupBootloaderAddEntry.xml"/>
+  <xi:include href="configureX_monitor.xml"/> -->
+<xi:include href="setupBootloader.xml"/>
 
   
 
-  <!-- <xi:include href="setupYabootGeneral.xml">
+  
+
+  <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
+ -->
+<!-- <xi:include href="setupYabootGeneral.xml">
 </xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
@@ -114,11 +154,15 @@ Team</link>, if you would like to help improve this manual.</para>
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
 
-  <xi:include href="configureTimezoneUTC.xml"/>
+  <xi:include href="locale.xml"/>
+
+  
+
+  <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
-  <xi:include href="selectCountry.xml"/>
 
-  <xi:include href="configureServices.xml"/>
+  <xi:include href="selectCountry.xml"/> -->
+<xi:include href="configureServices.xml"/>
 
   <xi:include href="selectMouse.xml"/>
 
@@ -137,4 +181,4 @@ Team</link>, if you would like to help improve this manual.</para>
   <xi:include href="exitInstall.xml"/>
 
   <xi:include href="uninstall-Mageia.xml"/>
-</article>
\ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/zh_TW/SelectAndUseISOs2.xml b/docs/docs/stable/installer/zh_TW/SelectAndUseISOs2.xml
index b33e3b0d..c4d09fcd 100644
--- a/docs/docs/stable/installer/zh_TW/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/zh_TW/SelectAndUseISOs2.xml
@@ -1,39 +1,73 @@
 <?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="zh_TW" xml:id="Select-and-use-ISOs">
   
+  
+  
+  
+  
+  
+  
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
+<!--2018/02/07 apb: Text and typography.-->
+<!--2018/02/17 apb: Typo-->
+<!--2018/02/19 apb: Update Download.png to Mga6.-->
+<!--2018/02/20 apb: Adjusted sections 1.1 and 1.2.
+  a) The main intro previously stated that there were 2 families of media, but listed at 1.2.4 is NetInstall. Therefore, I included a NetInstall entry in 1.1.
+  b) Logically followed to move the NetInstall description up frome 1.2.4 to the main intro.
+  c) Moved the 'Important' text from Live 1.2.3.1 Common features to the main intro because it is not really part of 'Common features', and I think its more natural location is in the main intro.-->
+<!--2018/02/25 apb: Centre-align all PNG's.-->
+<!--2019/01/03 apb: Update checking.png (which also includes sha512 option). Some rewording to 1.2.4.2, 1.3.1, 1.4.2.3.5. Update text to include sha512 option in 1.3.1 & 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
   </info>
   <section>
     <title>前言</title>
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image best suits your needs.</para>
-    <para>There are two families of media:</para>
+    <para>There are three types of installation media:</para>
     <itemizedlist>
       <listitem>
-        <para>Classical installer: Booting with this media provides you with the maximum
-flexibility when choosing what to install, and for configuring your
-system. In particular, you have a choice of which Desktop environment to
-install</para>
+        <para><emphasis role="bold">Classical installer:</emphasis> Booting with this
+media provides you with the maximum flexibility when choosing what to
+install, and for configuring your system. In particular, you have a choice
+of which Desktop environment to install.</para>
       </listitem>
       <listitem>
-        <para>LIVE media: This option allows you to try out Mageia without having to
-actually install it, or make any changes to your computer.  If the
-installation is decided, the process is simpler, but you get fewer choices
-than offered by the Classical installer</para>
+        <para><emphasis role="bold">LIVE media:</emphasis> This option allows you to try
+out Mageia without having to actually install it, or make any changes to
+your computer. However, the Live media also includes an Installer, which can
+be started when booting the media, or after booting into the Live operating
+system itself.</para>
+        <note>
+          <para>The Live Installer is simpler compared to the Classical Installer - but you
+have fewer configuration options.</para>
+        </note>
+        <important>
+          <para>Live ISOs can only be used to create <quote>clean</quote> installations,
+they cannot be used to upgrade previously installed Mageia releases.</para>
+        </important>
+      </listitem>
+      <listitem>
+        <para><emphasis role="bold">Net Install</emphasis>: These are minimal ISO's
+containing no more than that which is needed to start the DrakX installer
+and find <literal>DrakX-installer-stage2</literal> and other packages that
+are needed to continue and complete the install. These packages may be on
+the PC hard disk, on a local drive, on a local network or on the Internet.</para>
+        <para>These media are very light (less than 100 MB) and are convenient if
+bandwidth is too low to download a full DVD, or if you have a PC without a
+DVD drive or is unable to boot from a USB stick.</para>
       </listitem>
     </itemizedlist>
-    <para>Details are given in the next sections.</para>
+    <para>More details are given in the next sections.</para>
   </section>
   <section>
     <title>Media</title>
     <section>
       <title>Definition</title>
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
-install and/or update Mageia and by extension any physical support (DVD, USB
-stick, ...) the ISO file is copied to.</para>
+install and/or update Mageia and, by extension, any physical medium (DVD,
+USB stick, ...) the ISO file is copied to.</para>
       <para>You can find Mageia ISO's <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
     </section>
@@ -43,24 +77,25 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>These ISOs use the Classical installer called drakx.</para>
+            <para>These ISOs use the Classical installer called DrakX</para>
           </listitem>
           <listitem>
             <para>They are used for performing clean installs or to upgrade a previously
-installed version of Mageia.</para>
+installed version of Mageia</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>Some tools are available in the Welcome screen: Rescue System, Memory Test,
-Hardware Detection Tool.</para>
+            <para>Some tools are available in the Installer <quote>Welcome</quote> screen:
+<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware
+Detection Tool</emphasis></para>
           </listitem>
           <listitem>
-            <para>Each DVD contains many available desktop environments and languages.</para>
+            <para>Each DVD contains many available desktop environments and languages</para>
           </listitem>
           <listitem>
-            <para>You'll be given the choice during the installation to add non free software.</para>
+            <para>You'll be given the choice during the installation to add non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -72,21 +107,19 @@ Hardware Detection Tool.</para>
         <itemizedlist>
           <listitem>
             <para>Can be used to preview the Mageia operating system without having to install
-it. Can also be used to install Mageia if you wish.</para>
+it</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
+            <para>The Live media also includes an Installer.</para>
           </listitem>
           <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)</para>
           </listitem>
           <listitem>
-            <para><emphasis role="bold">Live ISOs can only be used to create clean
-installations, they cannot be used to upgrade previously installed Mageia
-releases.</emphasis></para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>They contain non free software.</para>
+            <para>They contain non-free software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -94,13 +127,13 @@ releases.</emphasis></para>
         <title>Live DVD Plasma</title>
         <itemizedlist>
           <listitem>
-            <para>Plasma desktop environment only.</para>
+            <para>Plasma desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only.</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -108,13 +141,13 @@ releases.</emphasis></para>
         <title>Live DVD GNOME</title>
         <itemizedlist>
           <listitem>
-            <para>GNOME desktop environment only.</para>
+            <para>GNOME desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>64 bit architecture only</para>
+            <para>64-bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -122,13 +155,13 @@ releases.</emphasis></para>
         <title>Live DVD Xfce</title>
         <itemizedlist>
           <listitem>
-            <para>Xfce desktop environment only.</para>
+            <para>Xfce desktop environment only</para>
           </listitem>
           <listitem>
-            <para>All available languages are present.</para>
+            <para>All available languages are present</para>
           </listitem>
           <listitem>
-            <para>32 or 64 bit architectures.</para>
+            <para>32 or 64-bit architectures</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -139,22 +172,10 @@ releases.</emphasis></para>
         <title>Common features</title>
         <itemizedlist>
           <listitem>
-            <para>These are minimal ISO's containing no more than that which is needed to
-start the drakx installer and find drakx-installer-stage2 and other packages
-that are needed to continue and complete the install. These packages may be
-on the PC hard disk, on a local drive, on a local network or on the
-Internet.</para>
-          </listitem>
-          <listitem>
-            <para>These media are very light (less than 100 MB) and are convenient if
-bandwidth is too low to download a full DVD, or if you have a PC without a
-DVD drive or is unable to boot from a USB stick.</para>
-          </listitem>
-          <listitem>
-            <para>Different media for 32 and 64 bit architectures.</para>
+            <para>Different media for 32 and 64-bit architectures</para>
           </listitem>
           <listitem>
-            <para>First steps are English language only.</para>
+            <para>First steps are English language only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -162,8 +183,8 @@ DVD drive or is unable to boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for those people who prefer not to use non-free
-software.</para>
+            <para>Contains only free software, for those who prefer to not use non-free
+software</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -171,8 +192,7 @@ software.</para>
         <title>netinstall-nonfree.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Contains non-free software (mostly drivers, codecs...) for people who need
-it.</para>
+            <para>Contains non-free software (mostly drivers, codecs...) for those who need it</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -184,16 +204,23 @@ it.</para>
       <title>Downloading</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, you are provided with some information, such as
-the mirror in use and an option to switch if the bandwidth is too low. If
-http is chosen, you will also see something regarding checksums.</para>
+the mirror in use and an option to switch to an alternative if the bandwidth
+is too low.</para>
+      <para>If http is chosen you will also see some information regarding checksums.</para>
+
+      <para><literal>md5sum</literal>, <literal>sha1sum</literal> and
+<literal>sha512sum</literal> (the most secure) are tools to check the ISO
+integrity. Copy one of the checksums (string of alphanumeric characters) for
+use in the next section.</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-      <para>md5sum and sha1sum are tools to check the ISO integrity. Choose one or the
-other, and copy the checksum <link linkend="integrity">for later
-use</link>. Then a window similar to this one appears:</para>
+<imageobject> <imagedata align="center" fileref="Checking.png"/>
+</imageobject></mediaobject>
+
+      <para>In the meantime, a window to download the actual ISO will open:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-      <para>Select the Save File option, then, click OK.</para>
+<imageobject> <imagedata align="center" fileref="Download.png"/>
+</imageobject></mediaobject>
+      <para>Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>.</para>
     </section>
     <section>
       <title xml:id="integrity">Checking the integrity of the downloaded media</title>
@@ -201,52 +228,63 @@ use</link>. Then a window similar to this one appears:</para>
 algorithm from the file to be downloaded. You may compare the checksum of
 your downloaded ISO against that of the original source ISO. If the
 checksums do not match, it means that the actual data on the ISO's do not
-match, and if it is the case, then you should retry the download or attempt
-a repair using BitTorrent.</para>
+match, and if that is the case, then you should retry the download or
+attempt a repair using BitTorrent.</para>
       <para>To generate the checksum for your downloaded ISO, open a console, (no need
 to be root), and:</para>
       <itemizedlist>
         <listitem>
-          <para>To use md5sum, type: <userinput>md5sum
-path/to/the/image/file.iso</userinput>.</para>
+          <para>To use the md5sum, type: <command>md5sum
+path/to/the/image/file.iso</command></para>
         </listitem>
         <listitem>
-          <para>To use sha1sum, type: <userinput>sha1sum
-path/to/the/image/file.iso</userinput></para>
+          <para>To use the sha1sum, type: <command>sha1sum
+path/to/the/image/file.iso</command></para>
+        </listitem>
+
+        <listitem>
+          <para>To use the sha512sum, type: <command>sha512sum
+path/to/the/image/file.iso</command></para>
         </listitem>
       </itemizedlist>
-      <para> Example:</para>
+      <para>Example:</para>
       <mediaobject>
-<imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-      <para>and compare the result (you may have to wait for a while) with the checksum
-provided by Mageia.</para>
+<imageobject> <imagedata align="center" fileref="Md5sum.png"/>
+</imageobject></mediaobject>
+
+      <para>then compare the result (you may have to wait for a while) with the ISO
+checksum provided by Mageia.</para>
     </section>
   </section>
   <section>
     <title>Burn or dump the ISO</title>
-    <para>The verified ISO can now be burned to a CD/DVD or dumped to a USB
-stick. This is not a standard copy operation as a bootable medium will
+    <para>The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> to a
+USB stick. This is not a standard copy operation, as a bootable medium will
 actually be created.</para>
     <section>
       <title>Burning the ISO to a CD/DVD</title>
-      <para>Whichever software you use, ensure that the option to burn an <emphasis
-role="bold">image</emphasis> is used, burn <emphasis
-role="bold">data</emphasis> or <emphasis role="bold">files</emphasis> is not
-correct. See <link
+      <para>Whichever software you use, ensure that the option to burn an<emphasis>
+image</emphasis> is used. Burn <emphasis>data</emphasis> or
+<emphasis>files</emphasis> is NOT correct. See the <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link> for more information.</para>
     </section>
     <section>
       <title>Dump the ISO to a USB stick</title>
-      <para>All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick
-and then use it to boot and install the system.</para>
+      <para>All Mageia ISOs are hybrids, which means you can dump them to a USB stick
+and then use that to boot and install the system.</para>
       <warning>
-        <para>"Dumping" an image onto a flash device destroys any previous file-system on
-the device; any existing data will be lost and the partition capacity will
-be reduced to the image size.</para>
+        <para>Dumping an image onto a flash device destroys any previous file-system on
+the device and all existing data will be lost.</para>
       </warning>
-      <para>To recover the original capacity, you must redo partitioning and re-format
-the USB stick.</para>
+      <note>
+        <para>Also, the only partition on the flash device will then just be the Mageia
+ISO partition.</para>
+        <para>So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will
+then only show up as 4GB. This is because the remaining 4GB is no longer
+formatted - hence not currently available for use. To recover the original
+capacity, you must reformat and repartition the USB stick.</para>
+      </note>
       <section>
         <title>Using a graphical tool within Mageia</title>
         <para>You can use a graphical tool like <link
@@ -258,7 +296,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
         <itemizedlist>
           <listitem>
             <para><link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
-"ISO image" option;</para>
+"ISO image" option</para>
           </listitem>
           <listitem>
             <para><link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32 Disk
@@ -267,7 +305,7 @@ Imager</link></para>
         </itemizedlist>
       </section>
       <section>
-        <title>Using Command line within a GNU/Linux system</title>
+        <title>Using the Command line within a GNU/Linux system</title>
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk overwriting
 potentially valuable existing data if you specify the wrong target device.</para>
@@ -277,27 +315,27 @@ potentially valuable existing data if you specify the wrong target device.</para
             <para>Open a console</para>
           </listitem>
           <listitem>
-            <para>Become a root (Administrator) user with the command <userinput>su
--</userinput> (don't forget the final '-' )</para>
+            <para>Become a <emphasis>root</emphasis> (Administrator) user with the command
+<command>su -</command> (don't forget the <command>-</command> )</para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Root.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
-            <para>Plug in your USB stick (do not mount it, this also means do not open any
-application or file manager that could access or read it)</para>
+            <para>Plug in your USB stick - but do not mount it (this also means do not open
+any application or file manager that could access or read it)</para>
           </listitem>
           <listitem>
-            <para>Enter the command <userinput>fdisk -l</userinput></para>
+            <para>Enter the command <command>fdisk -l</command></para>
             <mediaobject>
-<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="Fdisk.png"/> </imageobject></mediaobject>
           </listitem>
           <listitem>
             <para>Find the device name for your USB stick (by its size), for example
-<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick.</para>
+<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick.</para>
             <para>Alternatively, you can find the device name with the command
-<code>dmesg</code>: towards the end of this example, you can see the device
-name starting with <emphasis>sd</emphasis>, and in this case,
-<emphasis>sdd</emphasis> is the actual device. You can also see that its
+<command>dmesg</command>. Towards the end of the following example, you can
+see the device name starting with <filename>sd</filename>, and in this case,
+<filename>sdd</filename> is the actual device. You can also see that its
 size is 2GB:</para>
             <para><screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
@@ -319,21 +357,22 @@ size is 2GB:</para>
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen></para>
           </listitem>
           <listitem>
-            <para>Enter the command: <emphasis role="bold"># <userinput>dd
-if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis></para>
-            <para>Where X=your device name eg: /dev/sdd</para>
-            <para>Example:<emphasis role="bold"> # <userinput>dd
-if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd
-bs=1M</userinput></emphasis></para>
+            <para>Enter the command: <command>dd if=path/to/the/ISO/file
+of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
+            <para>Where <replaceable>X</replaceable>=your device name eg:
+<filename>/dev/sdd</filename></para>
+            <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
+of=/dev/sdd bs=1M</literal></para>
             <tip>
-              <para>It might helpful to know that <emphasis role="bold">if</emphasis> stands for
-<emphasis role="bold">i</emphasis>nput <emphasis role="bold">f</emphasis>ile
-and <emphasis role="bold">of</emphasis> stands for <emphasis
-role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
+              <para>It might be helpful to know that <emphasis role="bold">if</emphasis> stands
+for <emphasis role="bold">i</emphasis>nput <emphasis
+role="bold">f</emphasis>ile and <emphasis role="bold">of</emphasis> stands
+for <emphasis role="bold">o</emphasis>utput <emphasis
+role="bold">f</emphasis>ile</para>
             </tip>
           </listitem>
           <listitem>
-            <para>Enter the command: # <userinput>sync</userinput></para>
+            <para>Enter the command: <command>sync</command></para>
           </listitem>
           <listitem>
             <para>This is the end of the process, and you may now unplug your USB stick.</para>
@@ -342,4 +381,4 @@ role="bold">o</emphasis>utput <emphasis role="bold">f</emphasis>ile</para>
       </section>
     </section>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/acceptLicense.xml b/docs/docs/stable/installer/zh_TW/acceptLicense.xml
index cc1b0d67..7e471c96 100644
--- a/docs/docs/stable/installer/zh_TW/acceptLicense.xml
+++ b/docs/docs/stable/installer/zh_TW/acceptLicense.xml
@@ -17,6 +17,12 @@
 
   
 
+  
+
+  
+
+  
+
   <info>
     <!-- Made by marja on 2012 03 27 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -31,6 +37,9 @@
 <!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not 
        sure what is causing the corruption -->
 <!-- JohnR  2012-04-19 language proofreading -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-license.png to Mga6.-->
+<!--2018/02/25 apb: Slight reword to '..thanks for looking' sentence.-->
 <title xml:id="acceptLicense-ti1">授權與發行記錄</title>
   </info>
 
@@ -46,17 +55,26 @@ align="center" condition="live"/> </imageobject></mediaobject>
       <title xml:id="license-ti1">授權協議</title>
     </info>
 
-    <para>在安裝 <application>Mageia</application>之前，請先仔細閱讀許可證條款</para>
+    <itemizedlist>
+      <listitem>
+        <para>Before installing Mageia, please read the license terms and conditions
+carefully.</para>
+      </listitem>
 
-    <para>These terms and conditions apply to the entire
-<application>Mageia</application> distribution and must be accepted before
-you can continue.</para>
+      <listitem>
+        <para>These terms and conditions apply to the entire Mageia distribution and must
+be accepted before you can continue.</para>
+      </listitem>
 
-    <para>To proceed, simply select <guilabel>Accept</guilabel> and then click on
-<guibutton>Next</guibutton>.</para>
+      <listitem>
+        <para>To proceed, simply select <emphasis>Accept</emphasis> and then click on
+<emphasis>Next</emphasis></para>
+      </listitem>
+    </itemizedlist>
 
-    <para>If you decide not to accept these conditions, then we thank you for
-looking. Clicking <guibutton>Quit</guibutton> will reboot your computer.</para>
+    <para>If you decide not to accept these conditions, then we thank you for your
+interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your
+computer.</para>
 
     
   <!-- if you want two sections in a file, both need to be nested in a third section -
@@ -74,8 +92,7 @@ Release Notes</para>
 
     
 
-    <para>Important information about this release of
-<application>Mageia</application> can be viewed by clicking on the
-<guibutton>Release Notes</guibutton> button.</para>
+    <para>Important information about this particular Mageia release can be viewed by
+clicking on the <emphasis>Release Notes</emphasis> button.</para>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/addUser.xml b/docs/docs/stable/installer/zh_TW/addUser.xml
index 4281d7cd..66ff132e 100644
--- a/docs/docs/stable/installer/zh_TW/addUser.xml
+++ b/docs/docs/stable/installer/zh_TW/addUser.xml
@@ -1,32 +1,51 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_TW" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="addUser" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="addUser-ti1">User and Superuser Management</title>
+    <title xml:id="addUser-ti1">User Management</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-setRootPassword.png" align="center" revision="1"
+<!--2018/02/12 apb: Text and Typography.-->
+<!--2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.-->
+<!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+  Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
+<!--2018/02/24 apb: Changed list style.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
 xml:id="setRootPassword-im1"/> </imageobject> <imageobject> <imagedata
-format="PNG" fileref="live-user1.png"/> </imageobject></mediaobject>
+fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
 
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Set Administrator (root)  Password:</title>
     </info>
 
-    <para>It is advisable for all <application>Mageia</application> installations to
-set a <emphasis role="bold">superuser</emphasis> (administrator) password,
-usually called the <emphasis>root password</emphasis> in Linux. As you type
-a password into the top box a shield will change from red to yellow to green
-depending on the strength of the password. A green shield shows you are
-using a strong password. You need to repeat the same password in the box
-underneath, to check that the first entry was not mistyped.</para>
+    <para>It is advisable for all Mageia installations to set a
+<literal>superuser</literal> (Administrator) password, usually called the
+<emphasis>root </emphasis>password in Linux. As you type a password into the
+top box a shield will change from red-to-yellow-to-green depending on the
+strength of the password. A green shield shows you are using a strong
+password. You need to repeat the same password in the box underneath, to
+check that the first entry was not mistyped.</para>
 
     <note xml:id="givePassword">
-      <para>All passwords are case sensitive. It is best to use a mixture of letters
+      <para>All passwords are case-sensitive. It is best to use a mixture of letters
 (upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
@@ -36,43 +55,46 @@ underneath, to check that the first entry was not mistyped.</para>
       <title xml:id="enterUser-ti3">輸入一位使用者</title>
     </info>
 
-    <para>Add a user here. A regular user has fewer privileges than the <emphasis
-role="bold">superuser</emphasis> (root), but enough to use the internet,
-office applications or play games and anything else the average user might
-use their computer for.</para>
+    <para>Add a User here. A regular user has fewer privileges than the
+<literal>superuser</literal> (root), but enough to use the Internet, office
+applications or play games and anything else the average user might use a
+computer for.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guibutton>Icon</guibutton>: if you click on this button it will change the
-user's icon.</para>
-      </listitem>
+        <para><emphasis role="bold">Icon</emphasis></para>
 
-      <listitem>
-        <para><guilabel>Real Name</guilabel>: Insert the user's real name into this text
-box.</para>
+        <para>Click on this button if you want to change the user's icon</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use
-a version of the user's real name. <emphasis role="bold">The login name is
-case sensitive.</emphasis></para>
+        <para><emphasis role="bold">Real Name</emphasis></para>
+
+        <para>Insert the user's real name into this text box</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password</guilabel>: Type in the user password. There is a shield
-at the end of the text box that indicates the strength of the password. (See
-also <xref linkend="givePassword"/>)</para>
+        <para><emphasis role="bold">Login Name</emphasis></para>
+
+        <para>Enter the user login name or let DrakX use a version of the user's real
+name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Password (again)</guilabel>: Retype the user password DrakX will
-check that you have not mistyped the password.</para>
+        <para><emphasis role="bold">Password</emphasis></para>
+
+        <para>Type in the user password. There is a shield at the end of the text box that
+indicates the strength of the password. (See also <xref
+linkend="givePassword"/>)</para>
+
+        <para><emphasis role="bold">Password (again):</emphasis> Retype the user
+password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>Any users you added while installing Mageia, will have a home directory that
-is both read and write protected (umask=0027).</para>
+      <para>Any users added while installing Mageia, will have a home directory that is
+both read and write protected (umask=0027)</para>
 
       <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
@@ -82,32 +104,31 @@ management</emphasis>.</para>
     </note>
   </section>
 
-  <section xml:id="addUserAdvanced" condition="classical">
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
-      <title xml:id="addUserAdvanced-ti3">進階使用者管理</title>
+      <title xml:id="addUserAdvanced-ti3">User Management (advanced)</title>
     </info>
 
-    <para>The <guibutton>Advanced</guibutton> option allows you to edit further
-settings for the user you are adding.</para>
+    <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
+for the user you are adding.</para>
 
     <itemizedlist>
       <listitem>
-        <para><guilabel>Shell</guilabel>: This drop-down list allows you to change the
+        <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
-<emphasis role="bold">Bash</emphasis>, <emphasis role="bold">Dash</emphasis>
-and <emphasis role="bold">Sh</emphasis></para>
+<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
 
       <listitem>
-        <para><guilabel>User ID</guilabel>: Here you can set the <emphasis
-role="bold">user ID</emphasis> for any user you added in the previous
-screen. If you are unsure what the purpose of this is, then leave it blank.</para>
+        <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
+added in the previous screen. If you are unsure what the purpose of this is,
+then leave it blank.</para>
       </listitem>
 
       <listitem>
-        <para><guilabel>Group ID</guilabel>: This lets you set the <emphasis
-role="bold">group ID</emphasis>. Again, if unsure, leave it blank.</para>
+        <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
+unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/add_supplemental_media.xml b/docs/docs/stable/installer/zh_TW/add_supplemental_media.xml
index b1e640ae..db4ab621 100644
--- a/docs/docs/stable/installer/zh_TW/add_supplemental_media.xml
+++ b/docs/docs/stable/installer/zh_TW/add_supplemental_media.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="add_supplemental_media" version="5.0" xml:lang="zh_TW">
   <info>
-    <title xml:id="add_supplemental_media-ti1">Media Selection (Configure Supplemental Installation Media)</title>
+    <title xml:id="add_supplemental_media-ti1">Supplemental Installation Media</title>
   </info>
 
   
@@ -9,43 +9,49 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- papoteur 2013-04-13  - created -->
 <!-- marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection -->
 <!-- marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell -->
+<!--2018/02/10 apb: Text and typgraphy.-->
+<!--2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6-->
 <imageobject> <imagedata format="PNG"
 fileref="dx2-add_supplemental_media.png"
 xml:id="dx2-add_supplemental_media-im1" align="center" revision="1"/>
 </imageobject></mediaobject>
 
-  <para>This screen shows you the list of already recognized repositories. You can
-add other sources for packages, like an optical disc or a remote source.
+  <para>This screen shows you the list of already recognised repositories. You can
+add other sources for packages, like an optical-disc or a remote source.
 The source selection determines which packages will be available during the
-next steps.</para>
+subsequent steps.</para>
 
   <para>For a network source, there are two steps to follow:</para>
 
   <orderedlist>
     <listitem>
-      <para>Choosing and activation of the network, if not already up.</para>
+      <para>Choosing and activating the network, if not already up.</para>
     </listitem>
 
     <listitem>
       <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
 mirror, you have access to the selection of all repositories managed by
-Mageia, like the <emphasis role="bold">Nonfree</emphasis>, the <emphasis
-role="bold">Tainted</emphasis> repositories and the <emphasis
-role="bold">Updates</emphasis>. With the URL, you can designate a specific
+Mageia, like the <emphasis>Nonfree</emphasis>, the
+<emphasis>Tainted</emphasis> repositories and the
+<emphasis>Updates</emphasis>. With the URL, you can designate a specific
 repository or your own NFS installation.</para>
     </listitem>
   </orderedlist>
 
   <note>
-    <para>If you are updating a 64 bit installation which may contain some 32 bit
+    <para>If you are updating a 64-bit installation which may contain some 32-bit
 packages, it is advised to use this screen to add an online mirror by
-ticking one of the Network protocols here. The 64-bit DVD ISO only contains
-64-bit and noarch packages, it will not be able to update the 32-bit
-packages. However, after adding an online mirror, the installer will find
-the needed 32-bit packages there.</para>
+selecting one of the Network protocols here. The 64-bit DVD ISO only
+contains 64-bit and <emphasis>noarch</emphasis> packages, it will not be
+able to update the 32-bit packages. However, after adding an online mirror,
+the installer will find the needed 32-bit packages there.</para>
   </note>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/ask_mntpoint_s.xml b/docs/docs/stable/installer/zh_TW/ask_mntpoint_s.xml
index ba7c5ab8..b8a5b5c1 100644
--- a/docs/docs/stable/installer/zh_TW/ask_mntpoint_s.xml
+++ b/docs/docs/stable/installer/zh_TW/ask_mntpoint_s.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="ask_mntpoint_s" version="5.0" xml:lang="zh_TW">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="ask_mntpoint_s"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="ask_mntpoint_s-ti1">選取掛載點</title>
   </info>
@@ -21,6 +28,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 28 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -33,43 +44,35 @@
        write "it's type". And you're right about the redundant part, too, I removed it-->
 <!-- And JohnR says the Americans are WRONG! :-)) -->
 <!-- 2012-04-19  Language proofreading done -->
-<imageobject condition="classical"> <imagedata format="PNG"
-xml:id="chooseMountPoints-im1" align="center"
-fileref="dx2-chooseMountpoints.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-chooseMountpoints.png" align="center"
-xml:id="live-chooseMountPoints-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2019/01/04 apb: Typo & minor reword on custom mount-points.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="chooseMountPoints-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-chooseMountpoints.png" format="PNG" revision="1"
+xml:id="live-chooseMountPoints-im1"/> </imageobject></mediaobject>
 
   <para>Here you see the Linux partitions that have been found on your computer. If
-you don't agree with the <application>DrakX</application> suggestions, you
-can change the mount points.</para>
-
-  <note>
-    <para>If you change anything, make sure you still have a <emphasis
-role="bold"><literal>/</literal></emphasis> (root) partition.</para>
-  </note>
+you don't agree with the DrakX suggestions, you can change the mount points
+yourself.</para>
 
   <itemizedlist>
     <listitem>
-      <para>Every partition is shown to the left as: <emphasis role="bold">Device
-(capacity, mount point, type).</emphasis></para>
+      <para>To the left of the drop-down menus is a list of available partitions. For
+example: <filename>sda</filename> is a hard drive - and
+<filename>5</filename> is a <emphasis>partition number</emphasis>, followed
+by the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the
+partition.</para>
     </listitem>
 
     <listitem>
-      <para><emphasis role="bold">Device</emphasis>, is made up of: <emphasis
-role="bold">hard drive</emphasis>, [<emphasis role="bold">hard drive
-name</emphasis> (letter)], <emphasis role="bold">partition number</emphasis>
-(for example, <emphasis role="bold">sda5</emphasis>).</para>
-    </listitem>
-
-    <listitem>
-      <para>If you have several partitions, you can choose various different mount
-points from the drop down menu, such as <emphasis role="bold">/</emphasis>,
-<emphasis role="bold"><literal>/home</literal></emphasis> and <emphasis
-role="bold">/var</emphasis>. You can even make your own mount points, for
-instance <emphasis role="bold"><literal>/video</literal></emphasis> for a
-partition where you want to store your films, or <emphasis
-role="bold">/Data</emphasis> (or some other name) for your data.</para>
+      <para>If you have several partitions, you can choose various different
+<emphasis>mount points</emphasis> from the drop down menu, such as
+<filename>/</filename>, <filename>/home</filename> and
+<filename>/var</filename>. You can even make your own mount points, for
+instance <filename>/video</filename> for a partition where you want to store
+your films, or perhaps <filename>/Data</filename> for all your data files.</para>
     </listitem>
 
     <listitem>
@@ -79,13 +82,17 @@ mount point field blank.</para>
   </itemizedlist>
 
   <warning>
-    <para>If you are not sure what to choose, click <emphasis
-role="bold">Previous</emphasis> to go back and then tick <guilabel>Custom
-disk partitioning</guilabel>, where, you can click on a partition to see its
-type and size.</para>
+    <para>If you make any changes here, ensure you still have a <filename>/</filename>
+(root) partition.</para>
   </warning>
 
+  <tip>
+    <para>If you are not sure what to choose, click <emphasis>Previous</emphasis> to
+go back and then tick <emphasis>Custom disk partitioning</emphasis>, where
+you can click on a partition to see its type and size.</para>
+  </tip>
+
   <para>If you are sure the mount points are correct, click on
-<guibutton>Next</guibutton>, and choose whether you only want to format the
-partition(s) DrakX suggests, or more.</para>
-</section>
\ No newline at end of file
+<emphasis>Next</emphasis>, and choose whether you only want to format the
+partition suggested by DrakX, or more.</para>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/bestTime.xml b/docs/docs/stable/installer/zh_TW/bestTime.xml
index 78abf728..558e453b 100644
--- a/docs/docs/stable/installer/zh_TW/bestTime.xml
+++ b/docs/docs/stable/installer/zh_TW/bestTime.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="zh_TW" xml:id="bestTime"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="zh_TW" xml:id="bestTime">
+  
+  
   <info>
-    <title xml:id="bestTime-ti1">Clock settings</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/03/ apb: Redo definition for the Advanced option,-->
+<title xml:id="bestTime-ti1">Clock Settings</title>
   </info>
-
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-bestTime.png"
-format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
-
-  <para>In this step, you have to select on which time your internal clock is set,
-either local time or UTC time.</para>
-
-  <para>In advanced tab, you will find more options about clock settings.</para>
-</section>
+<imageobject> <imagedata format="PNG" align="center"
+fileref="live-bestTime.png" revision="1" xml:id="bestTime-im1"/>
+</imageobject></mediaobject>
+  <para>Here, you can select whether your computer internal clock is set to local
+time or UTC time.</para>
+  <para>In the <emphasis>Advanced</emphasis> tab, you can enable automatic time
+synchronization and specify an NTP server.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/bootLive.xml b/docs/docs/stable/installer/zh_TW/bootLive.xml
index 10e2e4dc..c967d4da 100644
--- a/docs/docs/stable/installer/zh_TW/bootLive.xml
+++ b/docs/docs/stable/installer/zh_TW/bootLive.xml
@@ -1,29 +1,176 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="zh_TW"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
-DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
-bootloader to launch the installation automatically after rebooting the
-computer. If that does not happen you may need to reconfigure your BIOS or
-press one key that will offer you to choose the peripheral from which the
-computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
-ISO. According to your BIOS settings, the computer boots perhaps directly on
-the USB device already plugged in a port. If that does not happen you may
-need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
-or USB stick) without writing anything on the disk, so expect a very slow
-system. Once the boot is done, you can proceed to the installation on a hard
-disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
-when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
-the inserted installation medium. Here, select other sources, like FTP or
-NFS servers. If the installation is carried out in a network with an SLP
-server, select one of the installation sources available on the server with
-this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
-optional disk with a driver update and will require its insertion during
-installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice)  or to
-process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
-duplicata of the previous lines suffixed with "USB". You have to choose
-them.</para><para>In each case, the first steps will be the same to choose language, timezone
-and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para></section></section>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  <info>
+    <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
+<!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
+<!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
+<!--2019/01/11 apb: 1.3 - Boot Mageia: change Dvd ->
+ DVD.-->
+<title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
+  </info>
+
+  <section xml:id="bootLive-1">
+    <info>
+      <title xml:id="bootLive1-ti1">Booting the medium</title>
+    </info>
+
+    <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
+the USB device in or place the DVD in the drive and restart the computer.</para>
+
+    <para>If the computer does not automatically boot from the USB or DVD you may need
+to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
+accessing the boot device menu to select a device from which the computer
+will boot.</para>
+
+    <tip>
+      <para>To access the BIOS or boot menu when the computer is starting, you can try
+pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
+<keycap>Esc</keycap> for the BIOS, or <keycap>Esc</keycap>,
+<keycap>F8</keycap>, <keycap>F10</keycap> or <keycap>F11</keycap> for the
+boot device menu. These (fairly common) keys are just a selection of
+possible options though.</para>
+    </tip>
+
+    <note>
+      <para>The actual screen that you will first see when booting from the Live media
+will depend on whether your computer motherboard is of the Legacy (BIOS) or
+UEFI type.</para>
+    </note>
+  </section>
+
+  <section xml:id="biosmode">
+    <info>
+      <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
+    </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>First screen while booting in BIOS mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).</para>
+
+        <para>Once the boot is done, you can proceed to the installation.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Boot the Mageia Live system using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">+ use non-free video drivers (slower to
+boot)</emphasis></para>
+
+            <para>Install Mageia using non-free video drivers</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+  </section>
+
+  <section xml:id="uefimode">
+    <info>
+      <title xml:id="uefimode-ti1">In UEFI mode</title>
+    </info>
+
+    <mediaobject condition="live">
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
+      <caption>
+        <para>First screen while booting in UEFI mode</para>
+      </caption>
+    </mediaobject>
+
+    <itemizedlist>
+      <title>Menu</title>
+
+      <listitem>
+        <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
+        <para>This option will boot the Mageia Live system from the connected DVD/USB
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+        <para>This option will install Mageia to a hard disk.</para>
+      </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
+    </itemizedlist>
+
+    <note>
+      <para>If you booted from a USB stick, you will see the above menu options
+duplicated, and in this case, you should choose from the menu pair that will
+be suffixed with "USB".</para>
+    </note>
+  </section>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/chooseDesktop.xml b/docs/docs/stable/installer/zh_TW/chooseDesktop.xml
index 72b1cb76..e19e0499 100644
--- a/docs/docs/stable/installer/zh_TW/chooseDesktop.xml
+++ b/docs/docs/stable/installer/zh_TW/chooseDesktop.xml
@@ -1,28 +1,52 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_TW" xml:id="chooseDesktop">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="chooseDesktop"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   <!--Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
 <info>
-    <title xml:id="chooseDesktop-ti1">桌面環境選擇</title>
+    <!--2018/02/12 apb: Some wording and typograpy.-->
+<!--2018/02/22 apb: Change last 2 paras to bulleted-->
+<!--2019/01/05 apb: Slight reword to para's 1,2 & 4.-->
+<title xml:id="chooseDesktop-ti1">桌面環境選擇</title>
   </info>
 
   
 
-  <para>Depending on your selection here, you may be offered further screens to
-fine-tune your choice.</para>
+  
+
+  <para>Some choices made here will open other screens with related options.</para>
 
-  <para>After the selection step(s), you will see a slide-show during package
-installation. The slide show can be disabled by pressing the
-<guilabel>Details</guilabel> button</para>
+  <para>After the selection step(s), you will see a slideshow during the
+installation of required packages. The slideshow can be disabled by pressing
+the <emphasis>Details</emphasis> button.</para>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" fileref="dx2-chooseDesktop.png"
-align="center"/> </imageobject></mediaobject>
-
-  <para>Choose whether you prefer to use the <application>KDE</application>
-<emphasis role="bold">Plasma</emphasis> or <application>GNOME</application>
-desktop environment. Both come with a full set of useful applications and
-tools. Tick <guilabel>Custom</guilabel> if you wish to use neither (or even
-use both), or if you want to modify the default software choices for these
-desktop environments. The <application>LXDE</application> desktop, for
-instance, is lighter than the previous two, sporting less eye candy and
-fewer packages installed by default.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="dx2-chooseDesktop.png"
+format="PNG"/> </imageobject></mediaobject>
+
+  <itemizedlist>
+    <listitem>
+      <para>Choose whether you prefer to use the KDE Plasma or GNOME desktop
+environment. Both come with a full set of useful applications and tools.</para>
+    </listitem>
+
+    <listitem>
+      <para>Select <emphasis>Custom</emphasis> if you do not wish to use either (or,
+actually use both) of these, or if you want to modify the default software
+choices for these desktop environments. The LXDE desktop, for instance, is
+lighter than the previous two, sporting less eye candy and having fewer
+packages installed by default.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/choosePackageGroups.xml b/docs/docs/stable/installer/zh_TW/choosePackageGroups.xml
index b121fbd0..6a544d76 100644
--- a/docs/docs/stable/installer/zh_TW/choosePackageGroups.xml
+++ b/docs/docs/stable/installer/zh_TW/choosePackageGroups.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_TW" xml:id="choosePackageGroups">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_TW" xml:id="choosePackageGroups" xreflabel="Choose Package Groups">
   <info>
     <title xml:id="choosePackageGroups-ti1">軟體套件群組選擇</title>
   </info>
 
   
 
+  
+
   <mediaobject>
 <!--Lebarhon 20170209 Updated SC-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackageGroups.png"
 align="center"/> </imageobject></mediaobject>
 
diff --git a/docs/docs/stable/installer/zh_TW/choosePackagesTree.xml b/docs/docs/stable/installer/zh_TW/choosePackagesTree.xml
index bad05f8d..615a679f 100644
--- a/docs/docs/stable/installer/zh_TW/choosePackagesTree.xml
+++ b/docs/docs/stable/installer/zh_TW/choosePackagesTree.xml
@@ -1,21 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" version="5.0" xml:lang="zh_TW">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="choosePackagesTree" xreflabel="Choose Packages Tree" version="5.0" xml:lang="zh_TW">
   <info>
     <title xml:id="choosePackagesTree-ti1">Choose Individual Packages</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: add xreflabel to this section.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-choosePackagesTree.png"
 align="center"/> </imageobject></mediaobject>
 
   <para>Here you can add or remove any extra packages to customize your
 installation.</para>
 
-  <para>After having made your choice, you can click on the <guibutton>floppy
-icon</guibutton> at the bottom of the page to save your choice of packages
-(saving to a USB key works, too). You can then use this file to install the
-same packages on another system, by pressing the same button during install
-and choosing to load it.</para>
+  <para>After having made your choice, you can click on the
+<emphasis>floppy</emphasis> icon at the bottom of the page to save your
+choice of packages (saving to a USB key works, too). You can then use this
+file to install the same packages on another system, by pressing the same
+button during install and choosing to load it.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/configureServices.xml b/docs/docs/stable/installer/zh_TW/configureServices.xml
index 925dc60b..8808603c 100644
--- a/docs/docs/stable/installer/zh_TW/configureServices.xml
+++ b/docs/docs/stable/installer/zh_TW/configureServices.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_TW" xml:id="configureServices">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Services" version="5.0" xml:lang="zh_TW" xml:id="configureServices">
   <info>
     <title xml:id="configureServices-ti1">Configure your Services</title>
   </info>
@@ -7,20 +7,31 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this section out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!-- 2018/02/16 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.-->
 <imageobject> <imagedata format="PNG" fileref="dx2-configureServices.png"
 xml:id="configureServices-im1" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para xml:id="configureServices-pa1" revision="1">Here you can choose which services should start when you boot your system.</para>
 
-  <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services.</para>
-
-  <para xml:id="configureServices-pa3" revision="1">The settings DrakX chose are usually good.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureServices-pa2" revision="1">Click on a triangle to expand a group to all the relevant services. The
+settings DrakX chose are usually good.</para>
+    </listitem>
 
-  <para xml:id="configureServices-pa4" revision="1">If you highlight a service, some information about it is shown in the info
+    <listitem>
+      <para xml:id="configureServices-pa4" revision="1">If you highlight a service, some information about it is shown in the info
 box below.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureServices-pa5" revision="1">Only change things when you know very well what you are doing.</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/configureTimezoneUTC.xml b/docs/docs/stable/installer/zh_TW/configureTimezoneUTC.xml
index a37ed630..cc6941bc 100644
--- a/docs/docs/stable/installer/zh_TW/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/zh_TW/configureTimezoneUTC.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureTimezoneUTC" version="5.0" xml:lang="zh_TW">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Configure Timezone" xml:id="configureTimezoneUTC" version="5.0" xml:lang="zh_TW">
   <info>
     <title xml:id="configureTimezoneUTC-ti6">Configure your Timezone</title>
   </info>
@@ -7,17 +7,27 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
 <!-- 2013-05-05 marja - added screenshot -->
+<!--2018/02/13 apb: Minor text adjustment.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
 <imageobject condition="classical"> <imagedata format="PNG"
 xml:id="configureTimezoneUTC-im1" align="center"
 fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject> <imagedata format="PNG" fileref="live-timeZone.png"
-condition="live"/> </imageobject></mediaobject>
+<imageobject condition="live"> <imagedata format="png"
+fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
 
-  <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your time-zone by choosing your country or a city close to you in the
-same time-zone.</para>
+  <itemizedlist>
+    <listitem>
+      <para xml:id="configureTimezoneUTC-pa1" revision="1">Choose your timezone by choosing your country, or a city close to you in the
+same timezone.</para>
+    </listitem>
+  </itemizedlist>
 
   <para xml:id="configureTimezoneUTC-pa2" revision="1">In the next screen you can choose to set your hardware clock to local time
 or to GMT, also known as UTC.</para>
diff --git a/docs/docs/stable/installer/zh_TW/configureX_card_list.xml b/docs/docs/stable/installer/zh_TW/configureX_card_list.xml
index da98e81b..00c9978f 100644
--- a/docs/docs/stable/installer/zh_TW/configureX_card_list.xml
+++ b/docs/docs/stable/installer/zh_TW/configureX_card_list.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_card_list" version="5.0" xml:lang="zh_TW">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="configureX_card_list"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -15,13 +26,15 @@
 <!-- tproof  -->
 <!-- lproof  -->
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
 <title xml:id="configureX_card_list-ti1">Choose an X Server (Configure your Graphic Card)</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_card_list-im1"
-align="center" fileref="dx2-configureX_card_list.png" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-configureX_card_list.png" format="PNG" revision="1"
+xml:id="configureX_card_list-im1"/> </imageobject></mediaobject>
 
   <para>DrakX has a very comprehensive database of video cards and will usually
 correctly identify your video device.</para>
@@ -29,33 +42,34 @@ correctly identify your video device.</para>
   <para>If the installer has not correctly detected your graphic card and you know
 which one you have, you can select it from the tree by: <itemizedlist>
       <listitem>
-        <para>vendor</para>
+        <para>Vendor</para>
       </listitem>
 
       <listitem>
-        <para>then the name of your card</para>
+        <para>then the make of your card</para>
       </listitem>
 
       <listitem>
-        <para>and the type of card</para>
+        <para>and the model of card</para>
       </listitem>
     </itemizedlist></para>
 
   <para>If you cannot find your card in the vendor lists (because it's not yet in
 the database or it's an older card) you may find a suitable driver in the
-<emphasis role="bold">Xorg</emphasis> category, which provides more than 40
-generic and open source video card drivers. If you still can't find a
-specific driver for your card there is the option of using the <emphasis
-role="bold">vesa</emphasis> driver which provides basic capabilities.</para>
+<emphasis>Xorg</emphasis> category, which provides more than 40 generic and
+open source video card drivers. If you still can't find a specific driver
+for your card there is the option of using the VESA driver which provides
+basic capabilities.</para>
 
-  <para>Be aware that if you select an incompatible driver you may only have access
-to the <emphasis role="bold">Command-line</emphasis> Interface.</para>
+  <caution>
+    <para>Be aware that if you select an incompatible driver you may only have access
+to the <emphasis>Command Line Interface</emphasis></para>
+  </caution>
 
   <para>Some video card manufacturers provide proprietary drivers for Linux which
-may only be available in the <emphasis role="bold">Nonfree</emphasis>
-repository and in some cases only from the card manufacturers' websites.</para>
-
-  <para>The <emphasis role="bold">Nonfree</emphasis> repository needs to be
-explicitly enabled to access them. If you didn't enable it previously, you
-should do this after your first reboot.</para>
-</section>
\ No newline at end of file
+may only be available in the <emphasis>Nonfree</emphasis> repository and in
+some cases only from the card manufacturers' websites. The
+<emphasis>Nonfree</emphasis> repository needs to be explicitly enabled to
+access them. If you didn't enable it previously, you should do this after
+your first reboot.</para>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/configureX_chooser.xml b/docs/docs/stable/installer/zh_TW/configureX_chooser.xml
index 68219389..443288b2 100644
--- a/docs/docs/stable/installer/zh_TW/configureX_chooser.xml
+++ b/docs/docs/stable/installer/zh_TW/configureX_chooser.xml
@@ -1,62 +1,92 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_chooser" version="5.0" xml:lang="zh_TW">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="configureX_chooser"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="configureX_chooser-ti1">Graphic Card and Monitor Configuration</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
-<imageobject> <imagedata format="PNG" xml:id="configureX_chooser-im1"
-fileref="dx2-configureX_chooser.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<!--2018/02/15 apb: Some text and typography.-->
+<!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
+<!--2018/02/23 apb: Typo.-->
+<!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
+format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="configureX_chooser-pa1">No matter which graphical environment (also known as desktop environment)
-you chose for this install of <application>Mageia</application>, they are
-all based on a graphical user interface system called <acronym>X Window
-System</acronym>, or simply <acronym>X</acronym>. So in order for
-<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>,
-<acronym>LXDE</acronym> or any other graphical environment to work well, the
-following <acronym>X</acronym> settings need to be correct. Choose the
-correct settings if none are shown, or if you think the details are
-incorrect.</para>
+you chose for this install of Mageia, they are all based on a graphical user
+interface system called <literal>X Window System</literal>, or simply
+<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other
+graphical environment to work well, the following <quote>X</quote> settings
+need to be correct.</para>
+
+  <para>Choose the appropriate settings manually if you think the details are
+incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="configureX_chooser-pa2" revision="1"><emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card
-from the list if needed.</para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphic Card</emphasis></para>
+
+      <para>If you need to, you can select a specific card from this expandable
+list. See <xref linkend="configureX_card_list"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa3" revision="1"><emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose
-<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from
-the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose
-<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and
-vertical refresh rates of your monitor.</para>
-
-      <warning>
-        <para xml:id="configureX_chooser-pa3a" revision="1">Incorrect refresh rates may damage your monitor</para>
-      </warning>
+      <para revision="1" xml:id="configureX_chooser-pa3"><emphasis role="bold">Monitor</emphasis></para>
+
+      <para>You can choose Plug 'n Play, if applicable, or choose your monitor from the
+<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose
+<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and
+vertical refresh rates of your monitor. See <xref
+linkend="configureX_monitor"/>.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa4" revision="1"><emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and
-color depth of your monitor can be set here.</para>
+      <para revision="1" xml:id="configureX_chooser-pa4"><emphasis role="bold">Resolution</emphasis></para>
+
+      <para>The resolution and color depth of your monitor can be set here.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa5" revision="1"><emphasis><guibutton>Test</guibutton></emphasis>: The test button does not
-always appear during install. If the option is there, and you test your
-settings, you should be ask whether your settings are correct. If you answer
-<emphasis role="bold">yes</emphasis>, the settings will be kept. If you
-don't see anything, you'll return to the configuration screen and be able to
-reconfigure everything until the test result is satisfactory. If the test
-option is not available, then make sure your settings are on the safe side.</para>
+      <para revision="1" xml:id="configureX_chooser-pa5"><emphasis role="bold">Test</emphasis></para>
+
+      <para>The test button does not always appear during install. If the option is
+there, and you test your settings, you should be asked to confirm that your
+settings are correct. If you answer <emphasis>Yes</emphasis>, the settings
+will be kept. If you don't see anything, you'll return to the configuration
+screen and be able to reconfigure everything until the test result is
+satisfactory. If the test option is not available, then make sure your
+settings are on the safe side.</para>
     </listitem>
 
     <listitem>
-      <para xml:id="configureX_chooser-pa6" revision="1"><emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to
-enable or disable various options.</para>
+      <para revision="1" xml:id="configureX_chooser-pa6"><emphasis role="bold">Options</emphasis></para>
+
+      <para>Here you can choose to enable or disable various options.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+
+  <warning>
+    <para revision="1" xml:id="configureX_chooser-pa3a">There is a risk of damaging a monitor if you choose refresh rates that are
+outside the frequency range of that monitor. This applies to older CRT
+displays: modern monitors will reject an unsupported frequency and normally
+enter standby mode.</para>
+  </warning>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/configureX_monitor.xml b/docs/docs/stable/installer/zh_TW/configureX_monitor.xml
index b21d06ed..702103e1 100644
--- a/docs/docs/stable/installer/zh_TW/configureX_monitor.xml
+++ b/docs/docs/stable/installer/zh_TW/configureX_monitor.xml
@@ -1,4 +1,15 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="configureX_monitor" version="5.0" xml:lang="zh_TW">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="configureX_monitor"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   
 
   
@@ -12,64 +23,82 @@
 <!-- Further text JohnR  2012-08-30 -->
 <!-- tproof -->
 <!---->
+<!--2018/02/12 apb: Text and typography-->
+<!--2018/02/22 apb: Change list style.-->
 <title xml:id="configureX_monitor-ti1">Choosing your Monitor</title>
   </info>
 
-  <para xml:id="configureX_monitor-pa1" revision="1">DrakX has a very comprehensive database of monitors and will usually
+  <para revision="1" xml:id="configureX_monitor-pa1">DrakX has a very comprehensive database of monitors and will usually
 correctly identify yours.</para>
 
   <warning>
-    <para xml:id="configureX_monitor-pa1w" revision="1"><emphasis role="bold">Selecting a monitor with different characteristics
+    <para revision="1" xml:id="configureX_monitor-pa1w"><emphasis role="bold">Selecting a monitor with different characteristics
 could damage your monitor or video hardware. Please don't try something
 without knowing what you are doing.</emphasis> If in doubt you should
 consult your monitor documentation.</para>
   </warning>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" xml:id="configureX_monitor-im1"
-fileref="dx2-configureX_monitor.png" align="center" revision="1"/>
-</imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-configureX_monitor.png"
+format="PNG" revision="1" xml:id="configureX_monitor-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="configureX_monitor-pa2" revision="1"><emphasis>Custom</emphasis></para>
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa2">Custom</term>
 
-  <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters, the vertical refresh
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa3">This option allows you to set two critical parameters: the vertical refresh
 rate and the horizontal sync rate. Vertical refresh determines how often the
 screen is refreshed and horizontal sync is the rate at which scan lines are
 displayed.</para>
 
-  <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
+        <para revision="1" xml:id="configureX_monitor-pa4">It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor
 type with a sync range that is beyond the capabilities of your monitor: you
 may damage your monitor. If in doubt, choose a conservative setting and
 consult your monitor documentation.</para>
+      </listitem>
+    </varlistentry>
 
-  <para xml:id="configureX_monitor-pa5" revision="1"><emphasis>Plug 'n Play</emphasis></para>
-
-  <para xml:id="configureX_monitor-pa6" revision="1">This is the default option and tries to determine the monitor type from the
-monitor database.</para>
-
-  <para xml:id="configureX_monitor-pa7" revision="1"><emphasis>Vendor</emphasis></para>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa5">Plug'n Play</term>
 
-  <para xml:id="configureX_monitor-pa8" revision="1">If the installer has not correctly detected your monitor and you know which
-one you have, you can select it from the tree by selecting: <itemizedlist>
       <listitem>
-        <para>vendor</para>
+        <para revision="1" xml:id="configureX_monitor-pa6">This is the default option and automatically tries to determine the monitor
+type from the monitor database.</para>
       </listitem>
+    </varlistentry>
 
-      <listitem>
-        <para>the monitor manufacturers name</para>
-      </listitem>
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa7">Vendor</term>
 
       <listitem>
-        <para>the monitor description</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can select it from the tree by selecting:</para>
       </listitem>
-    </itemizedlist></para>
+    </varlistentry>
+  </variablelist>
+
+  <itemizedlist>
+    <listitem>
+      <para>Manufacturer</para>
+    </listitem>
 
-  <para xml:id="configureX_monitor-pa9" revision="1"><emphasis>Generic</emphasis></para>
+    <listitem>
+      <para>Monitor model</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="configureX_monitor-pa10" revision="1">selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the <emphasis
-role="bold">Vesa</emphasis> card driver when your video hardware cannot be
-determined automatically. Once again it may be wise to be conservative in
-your selections.</para>
-</section>
\ No newline at end of file
+  <variablelist spacing="compact">
+    <varlistentry>
+      <term revision="1" xml:id="configureX_monitor-pa9">Generic</term>
+
+      <listitem>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
+1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
+often a good monitor selection group if you need to use the VESA card driver
+when your video hardware cannot be determined automatically.  Once again it
+may be wise to be conservative in your selections.</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/diskPartitioning.xml b/docs/docs/stable/installer/zh_TW/diskPartitioning.xml
new file mode 100644
index 00000000..33051f90
--- /dev/null
+++ b/docs/docs/stable/installer/zh_TW/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="zh_TW" version="5.0" xml:lang="zh_TW">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitioning</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/diskdrake.xml b/docs/docs/stable/installer/zh_TW/diskdrake.xml
index cbdeb1ab..541ccfe2 100644
--- a/docs/docs/stable/installer/zh_TW/diskdrake.xml
+++ b/docs/docs/stable/installer/zh_TW/diskdrake.xml
@@ -1,65 +1,108 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_TW" xml:id="diskdrake">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xreflabel="DiskDrake" xml:id="diskdrake"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
+  
+
+  
+
+  
+    
+    
+
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
 Lebarhon 20170902 added SC-->
-<title xml:id="diskdrake-ti1">Custom disk partitioning with DiskDrake</title>
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
+<!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
+<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<title xml:id="diskdrake-ti1">Custom Disk Partitioning with DiskDrake</title>
   </info>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake.png"/> </imageobject></mediaobject>
 
-  <warning>
-    <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <emphasis role="bold">/</emphasis>
-partition you must ensure that you have a separate <emphasis
-role="bold">/boot</emphasis> partition. The encryption option for the
-<emphasis role="bold">/boot</emphasis> partition must NOT be set, otherwise
-your system will be unbootable.</para>
-  </warning>
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="diskdrake-pa3">Modify the layout of your disk(s) here. You can remove or create partitions,
+change the filesystem or size of a partition and even view their details
+before you start.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa3" revision="2">Modify the layout of your disk(s)  here. You can remove or create
-partitions, change the filesystem of a partition or change its size and even
-view their details before you start.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
+device, like a USB key). In the screenshot above there are two available
+devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa4" revision="1">There is a tab at the top for every detected hard disk (or other storage
-device like a USB key). In the screen-shot above there are two available
-devices: <emphasis role="bold">sda </emphasis>and <emphasis
-role="bold">sdb</emphasis>.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on the desired partition first. Then view it,
+or choose a filesystem and a mount point, resize it or wipe
+it. <emphasis>Expert mode</emphasis> provides more options such as to label
+(name) a partition, or to choose a partition type.</para>
+    </listitem>
 
-  <para xml:id="diskdrake-pa5" revision="1">Take care with the <guibutton>Clear all</guibutton> option, use it only if
-you are sure you want to wipe all partitions on the selected storage device.</para>
+    <listitem>
+      <para revision="1" xml:id="diskdrake-pa6a">Continue until you have adjusted everything to your satisfaction, then click
+<emphasis>Done</emphasis> when you're ready.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe
-it. <guibutton>Expert mode</guibutton> provides more options such as a label
-(give a name to) a partition, or to choose a partition type.</para>
+  <warning>
+    <orderedlist>
+      <listitem>
+        <para revision="1" xml:id="diskdrake-pa5">Take care with the <emphasis>Clear all</emphasis> option, use it only if you
+are sure you want to wipe all partitions on the selected storage device.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa6a" revision="1">Continue until you have adjusted everything to your satisfaction.</para>
+      <listitem>
+        <para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <filename>/</filename> partition you
+must ensure that you have a separate <filename>/boot</filename>
+partition. The encryption option for the <filename>/boot</filename>
+partition must NOT be set, otherwise your system will be unbootable.</para>
+      </listitem>
+    </orderedlist>
+  </warning>
+
+  <important>
+    <itemizedlist>
+      <listitem>
+        <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
+Partition) is present and correctly mounted on
+<filename>/boot/EFI</filename>. See Figure 1 below.</para>
+      </listitem>
 
-  <para xml:id="diskdrake-pa7" revision="1">Click <guibutton>Done</guibutton> when you're ready.</para>
+      <listitem>
+        <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+partition is present and of the correct type. See Figure 2 below.</para>
+      </listitem>
+    </itemizedlist>
+  </important>
 
-  <note>
-    <para>If you are installing Mageia on a UEFI system, check that an ESP (EFI System
-Partition) is present and correctly mounted on /boot/EFI (see below)</para>
+  <figure>
+    <title>EFI System Partition</title>
 
-    <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
-  </note>
+<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-diskdrake2.png"/> </imageobject> <imageobject condition="live">
+<imagedata align="center" fileref="live-diskdrake2.png"/> </imageobject></mediaobject></figure>
 
-  <note>
-    <para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present and of the correct type</para>
+  <figure>
+    <title>BIOS boot partition</title>
 
-    <mediaobject>
+<mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
 condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-  </note>
-</section>
\ No newline at end of file
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject></figure>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/doPartitionDisks.xml b/docs/docs/stable/installer/zh_TW/doPartitionDisks.xml
index 545a4810..4f61808d 100644
--- a/docs/docs/stable/installer/zh_TW/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/zh_TW/doPartitionDisks.xml
@@ -1,172 +1,214 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_TW" xml:id="doPartitionDisks">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="doPartitionDisks"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns="http://docbook.org/ns/docbook">
   
 
   
 
-  <info>
-    <!---->
-<!-- lebarhon 20161216 updated for Mageia 6
+  
+
+  
 
+  
+
+  
+
+  
+
+  <info>
+    <!--lebarhon 20161216 updated for Mageia 6
+  
 lebarhon 20170209 added SC-->
-<title xml:id="doPartitionDisks-ti1">分割磁區</title>
+<!--2018/02/12 apb: Text and typography. Added link to diskdrake in 2nd Note-->
+<!--2018/02/17 apb: Centre-align last two PNG's. Also, fix some wonky XML formatting.-->
+<!--2018/02/17 apb: Moved 'Erase ...' & 'Custom ...' list items up with the other list items. I can see the reason for splitting the list with the example SC, 
+  but I think this way is clearer (flow) overall. I don't believe that combining the list will interfere with the example SC and the relevant list item.-->
+<!--2018/02/21 apb: Changed list styles.-->
+<!--2018/02/24 apb: Changed list styles.-->
+<!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<title xml:id="doPartitionDisks-ti1">Suggested Partitioning</title>
   </info>
 
-  <para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) along with the
-DrakX partitioning proposals for where to install
-<application>Mageia</application>.</para>
+  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see the content of your hard drive(s) along with the
+DrakX partitioning proposals for where to install Mageia.</para>
 
-  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from those shown below will vary according to the
-layout and content of your particular hard drive(s).</para>
+  <para revision="1" xml:id="doPartitionDisks-pa2">The actual options available from those shown below will vary according to
+the layout and content of your particular hard drive(s).</para>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks.png"/> </imageobject></mediaobject>
 
-  <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
-      <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa4">Use Existing Partitions</para>
+  <itemizedlist>
+    <title>Main Options</title>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa4"><emphasis role="bold">Use Existing Partitions</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa5" revision="1">If this option is available, then existing Linux compatible partitions have
+      <para revision="1" xml:id="doPartitionDisks-pa5">If this option is available, then existing Linux compatible partitions have
 been found and may be used for the installation.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa6" revision="1">Use Free Space</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa6"><emphasis role="bold">Use Free Space</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa7" revision="1">If you have unused space on your hard drive then this option will use it for
+      <para revision="1" xml:id="doPartitionDisks-pa7">If you have unused space on your hard drive then this option will use it for
 your new Mageia installation.</para>
-      </listitem>
+    </listitem>
 
-      <listitem>
-        <para xml:id="doPartitionDisks-pa8" revision="1">Use Free Space on a Windows Partition</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa8"><emphasis role="bold">Use Free Space on a Windows Partition</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa9" revision="1">If you have unused space on an existing Windows partition, the installer may
-offer to use it.</para>
+      <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
+offer to use it. This can be a useful way of making room for your new Mageia
+installation, but is a risky operation so you should make sure you have
+backed up all important files!</para>
 
-        <para xml:id="doPartitionDisks-pa10" revision="2">This can be a useful way of making room for your new Mageia installation,
-but is a risky operation so you should make sure you have backed up all
-important files!</para>
+      <para>With this option, the installer displays the remaining Windows partition in
+light blue and the proposed Mageia partition in dark blue with their
+intended sizes just underneath. You have the option to modify these sizes by
+clicking and dragging the gap between both partitions.  See the following
+screenshot:</para>
+    </listitem>
+
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa12"><emphasis role="bold">Erase and use Entire Disk</emphasis></para>
+
+      <para revision="1" xml:id="doPartitionDisks-pa13">This option will allocate the entire drive for Mageia</para>
 
+      <warning>
+        <para revision="1" xml:id="doPartitionDisks-pa14">This will erase ALL data on the selected hard drive. Take care! If you
+intend to use part of the disk for something else, or you already have data
+on the drive that you are not prepared to lose, then do not use this option.</para>
+      </warning>
+
+      <important>
         <para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
 partition must be "clean", meaning that Windows must have closed down
 correctly the last time it was used. It must also have been defragmented,
 although this is not a guarantee that all files in the partition have been
 moved out of the area that is about to be used. It is highly recommended to
 back up your personal files.</para>
+      </important>
+    </listitem>
 
-        <para>With this option, the installer displays the remaining Windows partition in
-light blue and the proposed Mageia partition in dark blue with their
-intended sizes just underneath. You have the option to modify these sizes by
-clicking and dragging the gap between both partitions. See the following
-screen-shot.</para>
-
-        <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
-      </listitem>
-    </itemizedlist> <itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa12" revision="1">Erase and use Entire Disk.</para>
-
-        <para xml:id="doPartitionDisks-pa13" revision="1">This option will allocate the entire drive for Mageia.</para>
+    <listitem>
+      <para revision="1" xml:id="doPartitionDisks-pa16"><emphasis role="bold">Custom Disk Partitioning</emphasis></para>
 
-        <para xml:id="doPartitionDisks-pa14" revision="1">Note! This will erase ALL data on the selected hard drive. Take care!</para>
+      <para revision="1" xml:id="doPartitionDisks-pa17">This gives you complete control over the placing of the installation on your
+hard drive(s).</para>
+    </listitem>
+  </itemizedlist>
 
-        <para xml:id="doPartitionDisks-pa15" revision="1">If you intend to use part of the disk for something else, or you already
-have data on the drive that you are not prepared to lose, then do not use
-this option.</para>
-      </listitem>
-    </itemizedlist><itemizedlist>
-      <listitem>
-        <para xml:id="doPartitionDisks-pa16" revision="1">自訂磁碟分割</para>
+  <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
+
+  <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
+option, then the installer will allocate the available space according to
+the following rules:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>If the total available space is less than 50 GB, then only one partition is
+created. This will be the <filename>/</filename> (root)  partition.</para>
+    </listitem>
+
+    <listitem>
+      <para>If the total available space is greater than 50 GB, then three partitions
+are created</para>
 
-        <para xml:id="doPartitionDisks-pa17" revision="1">This gives you complete control over the placing of the installation on your
-hard drive(s).</para>
-      </listitem>
-    </itemizedlist></para>
+      <itemizedlist>
+        <listitem>
+          <para>6/19 of the total available place is allocated to <filename>/</filename>
+with a maximum of 50 GB</para>
+        </listitem>
 
-  <para><emphasis role="bold">Partition sizing:</emphasis></para>
+        <listitem>
+          <para>1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB</para>
+        </listitem>
 
-  <para>If you are not using the <emphasis role="bold">Custom disk
-partitioning</emphasis> option, the installer will allocate the available
-space according to the following rules:</para>
+        <listitem>
+          <para>the rest (at least 12/19) is allocated to <filename>/home</filename></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
 
-  <para><itemizedlist>
-      <listitem>
-        <para>If the total available space is less than 50 GB, then only one partition is
-created. This will be the <emphasis role="bold">/</emphasis> (root)
-partition.</para>
-      </listitem>
+  <para>This means that from 160 GB or greater available space, the installer will
+create three partitions:</para>
 
-      <listitem>
-        <para>If the total available space is greater than 50 GB, then three partitions
-are created</para>
+  <itemizedlist>
+    <listitem>
+      <para>50 GB for <filename>/</filename></para>
+    </listitem>
 
-        <itemizedlist>
-          <listitem>
-            <para>6/19 of the total available place is allocated to <emphasis
-role="bold">/</emphasis> with a maximum of 50 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>1/19 is allocated to swap with a maximum of 4 GB</para>
-          </listitem>
-
-          <listitem>
-            <para>the rest (at least 12/19) is allocated to <emphasis
-role="bold">/home.</emphasis></para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist></para>
+    <listitem>
+      <para>4 GB for <filename>swap</filename></para>
+    </listitem>
 
-  <para>That means that from 160 GB or greater available space, the installer will
-create three partitions: 50 GB for <emphasis role="bold">/</emphasis>, 4 GB
-for <emphasis role="bold">swap</emphasis> and the remainder for <emphasis
-role="bold">/home</emphasis>.</para>
+    <listitem>
+      <para>and the remainder for <filename>/home</filename></para>
+    </listitem>
+  </itemizedlist>
 
   <note>
     <para>If you are using a UEFI system, the ESP (EFI System Partition) will be
-automatically detected - or created if it does not exist yet, and mounted on
-/boot/EFI. The <emphasis role="bold">Custom disk partitioning</emphasis>
-option is the only one that allows to check it has been correctly done</para>
+automatically detected - or created if it does not exist yet - and mounted
+on <filename>/boot/EFI</filename>. The <emphasis>Custom disk
+partitioning</emphasis> option is the only one that allows to check it has
+been correctly done.</para>
+
+    <para>If you are using a Legacy (also known as BIOS) system with a GPT partitioned
+disk, you need to create a BIOS boot partition if it doesn't already
+exist. It should be about 1 MiB with no mount point. It can be created with
+the Installer, under <emphasis>Custom disk partitioning</emphasis>, like any
+other partition. Be sure to select <quote>BIOS boot partition</quote> for
+filesystem type.</para>
+
+    <para>See <xref linkend="diskdrake"/> for information on how to proceed.</para>
   </note>
 
-  <note>
-    <para>If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to
-create a BIOS boot partition if not already existing. It is a roughly 1 MiB
-partition with no mount point. Choose <xref linkend="diskdrake"/> to be able
-to create it with the Installer like any other partition, just select BIOS
-boot partition as the filesystem type.</para>
-
-    <mediaobject>
+  <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
-</imageobject></mediaobject>
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
-    <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
-</imageobject></mediaobject>
-  </note>
+  <mediaobject>
+<imageobject> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
-  <warning>
+  <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
 previous standard of 512. Due to lack of available hardware, the
 partitioning tool used in the installer has not been tested with such a
-drive. Also some SSD devices now use an erase block size over 1 MB. If you
-have such a device we suggest that you partition the drive in advance, using
-an alternative partitioning tool like <emphasis
-role="bold">gparted</emphasis>, and to use the following settings:</para>
+drive.</para>
+
+    <para>Some SSD devices now use an erase block size over 1 MB. If you have such a
+device we suggest that you partition the drive in advance, using an
+alternative partitioning tool like gparted, and to use the following
+settings:</para>
 
-    <para><emphasis role="bold">Align to</emphasis> = MiB</para>
+    <itemizedlist>
+      <listitem>
+        <para><emphasis>Align to</emphasis> = MiB</para>
+      </listitem>
 
-    <para><emphasis role="bold">Free space preceding (MiB)</emphasis> = 2</para>
+      <listitem>
+        <para><emphasis>Free space preceding (MiB)</emphasis> = 2</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Also make sure all partitions are created using an even number of megabytes.</para>
-  </warning>
-</section>
\ No newline at end of file
+  </important>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/exitInstall.xml b/docs/docs/stable/installer/zh_TW/exitInstall.xml
index de835f86..5b2c4091 100644
--- a/docs/docs/stable/installer/zh_TW/exitInstall.xml
+++ b/docs/docs/stable/installer/zh_TW/exitInstall.xml
@@ -5,23 +5,28 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added clickable link to mageia.org-->
 <imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
 align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring
-<application>Mageia</application> and it is now safe to remove the
-installation medium and reboot your computer.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring Mageia and it is now safe to
+remove the installation medium and reboot your computer.</para>
 
-  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
-systems (if there are more than one) on your computer.</para>
+  <para xml:id="exitInstall-pa2" revision="2">After rebooting, you can use the bootloader screen to choose which operating
+system to start (if there are more than one on your computer).</para>
 
   <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the settings for the bootloader, your Mageia install
 will be automatically selected and started.</para>
 
   <para xml:id="exitInstall-pa4" revision="1">Enjoy!</para>
 
-  <para xml:id="exitInstall-pa5" revision="1">Visit www.mageia.org if you have any questions or want to contribute to
-Mageia</para>
+  <para xml:id="exitInstall-pa5" revision="1">Visit <link ns4:href="http://www.mageia.org/en/">www.mageia.org/en/</link>
+if you have any questions or want to contribute to Mageia</para>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/firewall.xml b/docs/docs/stable/installer/zh_TW/firewall.xml
index d597b913..427c7196 100644
--- a/docs/docs/stable/installer/zh_TW/firewall.xml
+++ b/docs/docs/stable/installer/zh_TW/firewall.xml
@@ -1,6 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="zh_TW">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="zh_TW" xreflabel="Firewall">
+  
+
+  
+
   <info>
-    <title xml:id="firewall-ti1">防火牆</title>
+    <!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/25 apb: Added xreflabel for this section.-->
+<title xml:id="firewall-ti1">防火牆</title>
   </info>
 
   <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
@@ -9,22 +15,22 @@ target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
   <para>In the default setting (no button is checked), no service of the system is
-accessible from the network. The <emphasis role="bold">Everything (no
-firewall)</emphasis> enables access to all services of the machine - an
-option that does not make much sense in the context of the installer since
-it would create a totally unprotected system. Its veritable use is in the
-context of the Mageia Control Center (which uses the same GUI layout) for
-temporarily disabling the entire set of firewall rules for testing and
+accessible from the network. The <emphasis>Everything (no
+firewall)</emphasis> option enables access to all services of the machine -
+an option that does not make much sense in the context of the installer
+since it would create a totally unprotected system. Its veritable use is in
+the context of the Mageia Control Center (which uses the same GUI layout)
+for temporarily disabling the entire set of firewall rules for testing and
 debugging purposes.</para>
 
   <para>All other options are more or less self-explanatory. As an example, you will
-enable the <emphasis role="bold">CUPS server</emphasis> if you want printers
-on your machine to be accessible from the network.</para>
+enable the CUPS server if you want printers on your machine to be accessible
+from the network.</para>
 
   <para><emphasis role="bold">Advanced</emphasis></para>
 
-  <para>The <emphasis role="bold">Advanced</emphasis> option opens a window where
-you can enable a series of services by typing a list of couples (blank
+  <para>The <emphasis>Advanced</emphasis> option opens a window where you can enable
+a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
   <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
diff --git a/docs/docs/stable/installer/zh_TW/formatPartitions.xml b/docs/docs/stable/installer/zh_TW/formatPartitions.xml
index 79914841..17e27348 100644
--- a/docs/docs/stable/installer/zh_TW/formatPartitions.xml
+++ b/docs/docs/stable/installer/zh_TW/formatPartitions.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="formatPartitions" version="5.0" xml:lang="zh_TW">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="formatPartitions"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="formatPartitions-ti1">Formatting</title>
   </info>
@@ -11,32 +18,36 @@
 
   
 
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 03 29 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-formatPartitions.png" xml:id="formatPartitions-im1"
-align="center" revision="1"/> </imageobject> <imageobject condition="live">
-<imagedata format="PNG" xml:id="live-formatPartitions-im1" align="center"
-fileref="live-formatPartitions.png" revision="1"/> </imageobject></mediaobject>
-
-  <para xml:id="formatPartitions-pa1" revision="2">Here you can choose which partition(s) you wish to format. Any data on
+<!--2018/02/10 apb: Text and typography.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-formatPartitions.png" format="PNG" revision="1"
+xml:id="formatPartitions-im1"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-formatPartitions.png" format="PNG" revision="1"
+xml:id="live-formatPartitions-im1"/> </imageobject></mediaobject>
+
+  <para revision="2" xml:id="formatPartitions-pa1">Here you can choose which partition(s) you wish to format. Any data on
 partitions <emphasis>not</emphasis> marked for formatting will be preserved.</para>
 
-  <para xml:id="formatPartitions-pa2" revision="1">Usually at least the partitions DrakX selected, need to be formatted</para>
+  <para revision="1" xml:id="formatPartitions-pa2">Usually, at least the partitions that DrakX selected need to be formatted.</para>
 
-  <para xml:id="formatPartitions-pa3" revision="1">Click on <guibutton>Advanced</guibutton> to choose partitions you want to
-check for so called <emphasis>bad blocks</emphasis></para>
+  <para revision="1" xml:id="formatPartitions-pa3">Click on <emphasis>Advanced</emphasis> to choose the partitions you want to
+check for so-called <emphasis>bad blocks</emphasis></para>
 
   <tip>
-    <para xml:id="formatPartitions-pa4" revision="1">If you're not sure you have made the right choice, you can click on
-<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton>
-and then on <guibutton>Custom</guibutton> to get back to the main screen,
-where you can choose to view details of your partitions.</para>
+    <para revision="1" xml:id="formatPartitions-pa4">If you're not sure you have made the right choice, you can click on
+<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and
+then on <emphasis>Custom</emphasis> to get back to the main screen, where
+you can choose to view details of your partitions.</para>
   </tip>
 
-  <para xml:id="formatPartitions-pa5" revision="1">When you are confident about the selection, click on
-<guibutton>Next</guibutton> to continue.</para>
-</section>
\ No newline at end of file
+  <para revision="1" xml:id="formatPartitions-pa5">When you are confident about the selections, click on
+<emphasis>Next</emphasis> to continue.</para>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/graphicalConfiguration.xml b/docs/docs/stable/installer/zh_TW/graphicalConfiguration.xml
new file mode 100644
index 00000000..c8f3bb9a
--- /dev/null
+++ b/docs/docs/stable/installer/zh_TW/graphicalConfiguration.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="graphicalConfiguration"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  <info>
+    <!--2019/01/12 apb: Created this xml as parent for the 'configureX' xml's.-->
+<title xml:id="graphicalConfiguration-ti1">Graphical Configuration</title>
+  </info>
+
+  <xi:include href="configureX_chooser.xml"/>
+
+  <xi:include href="configureX_card_list.xml"/>
+
+  <xi:include href="configureX_monitor.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/installUpdates.xml b/docs/docs/stable/installer/zh_TW/installUpdates.xml
index ffb6f359..9dbbd4b5 100644
--- a/docs/docs/stable/installer/zh_TW/installUpdates.xml
+++ b/docs/docs/stable/installer/zh_TW/installUpdates.xml
@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns52="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xlink" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installUpdates" version="5.0" xml:lang="zh_TW">
-  <info>
-    <title xml:id="installUpdates-ti1">更新</title>
-  </info>
+  
 
   
 
@@ -11,20 +9,38 @@
 
   
 
-  <mediaobject>
-<!-- Made by marja on 2012 03 30 -->
+  
+
+  <info>
+    <!-- Made by marja on 2012 03 30 -->
 <!-- NEEDS TO BE REVIEWED! -->
-<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
+<!-- marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" 
+  xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename-->
 <!-- marja, 2012-04-24 added screenshot -->
-<imageobject> <imagedata format="PNG" fileref="dx2-installUpdates.png"
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/25 apb: Added bullets to some text.-->
+<title xml:id="installUpdates-ti1">更新</title>
+  </info>
+
+  <mediaobject>
+<imageobject> <imagedata format="png" fileref="dx2-installUpdates.png"
 align="center" revision="1" xml:id="installUpdates-im1"/> </imageobject></mediaobject>
 
-  <para xml:id="installUpdates-pa1" revision="1">Since this version of <application>Mageia</application> was released, some
-packages will have been updated or improved.</para>
+  <para xml:id="installUpdates-pa1" revision="1">Since this version of Mageia was released, some packages will have been
+updated or improved.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para xml:id="installUpdates-pa2" revision="1">Select <emphasis>Yes</emphasis> if you wish to download and install them</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa2" revision="1">Choose <guilabel>Yes</guilabel> if you wish to download and install them,
-select <guilabel>No</guilabel> if you don't want to do this now, or if you
+    <listitem>
+      <para>Select <emphasis>No</emphasis> if you don't want to do this now, or if you
 aren't connected to the Internet</para>
+    </listitem>
 
-  <para xml:id="installUpdates-pa3" revision="1">Press <guibutton>Next</guibutton> to continue</para>
+    <listitem>
+      <para xml:id="installUpdates-pa3" revision="1">Press <emphasis>Next</emphasis> to continue</para>
+    </listitem>
+  </itemizedlist>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/installer.xml b/docs/docs/stable/installer/zh_TW/installer.xml
index 97ccc1ba..458eba2a 100644
--- a/docs/docs/stable/installer/zh_TW/installer.xml
+++ b/docs/docs/stable/installer/zh_TW/installer.xml
@@ -6,165 +6,164 @@
          xmlns:ns3="http://www.w3.org/1999/xhtml"
          xmlns:ns2="http://www.w3.org/1999/xlink"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   <info>
-    <title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
+    <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
+<!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
+  Some listitem end-tags were directly after mediaobject end-tags, while the main listitem element was above the mediaobject.
+  So I moved the listitem end-tags above the mediaobjects, to their natural positions. This also was in the imported XML.-->
+<!--2018/02/19 apb: Updated welcome.png to Mga6.-->
+<!--2018/02/21 apb: a) Updated rest of BIOS PNG's, b) Refined text and reworked this XML.-->
+<!--2018/02/24 apb: Changed main list type-->
+<!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
+<!--2018/02/27 apb: Fixed UEFI section nest level.-->
+<!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
+<title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
   </info>
 
   <para>Whether you are new to GNU-Linux or an experienced user, the Mageia
 Installer is designed to help make your installation or upgrade as easy as
 possible.</para>
 
-  <para>The initial menu screen has various options, however the default one will
-start the installer, which will normally be all that you will need.</para>
+  <section>
+    <title>The installation steps</title>
+
+    <itemizedlist>
+      <listitem>
+        <para>The install process is divided into a number of steps - the status of which
+is indicated in a panel to the left of the screen.</para>
+      </listitem>
+
+      <listitem>
+        <para>Each step has one or more screens, which may also have
+<emphasis>Advanced</emphasis> sections with extra, less commonly required
+options.</para>
+      </listitem>
+
+      <listitem>
+        <para>Most screens have <emphasis>Help</emphasis> buttons for further details
+about the particular step.</para>
+      </listitem>
+    </itemizedlist>
+
+    <caution>
+      <para>If at some point during the install you decide to abort the installation, it
+is possible to reboot, but please think twice before you do this. Once a
+partition has been formatted or updates have started to be installed, your
+computer is no longer in the same state and rebooting it could very well
+leave you with an unusable system.</para>
+
+      <para>If, in spite of this, you are very sure rebooting is what you want, go to a
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
+    </caution>
+  </section>
 
   <section>
     <title>Installation Welcome Screen</title>
 
-    <section>
-      <title>Using a Mageia DVD</title>
+    <para>The particular screen that you will first see when booting from the
+Installation media will depend on whether your computer motherboard is of
+the Legacy (BIOS) or UEFI type.</para>
 
-      <para>Here are the default welcome screens when using a Mageia DVD, The first one
-is what you will see if you have a UEFI system, the second one is for a
-Legacy system:</para>
+    <para>The welcome menu screen has various options, however the default option will
+start the installer, and is normally all that you will need.</para>
+
+    <section>
+      <title>Legacy (BIOS) Systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
+</imageobject></mediaobject>
 
-      <para>From this screen, you have access to options by pressing "<emphasis
-role="bold">e</emphasis>" to enter the edit mode. To come back to this
-screen, press either <emphasis role="bold">Esc</emphasis> key to quit
-without saving or press the key <emphasis role="bold">Ctrl</emphasis> or
-<emphasis role="bold">F10</emphasis> to quit with saving.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-      <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
-
-      <para>From this screen, it is possible to set some preferences (note that the
-options <emphasis role="bold">F1</emphasis> to <emphasis
-role="bold">F6</emphasis> are available only on Legacy systems):<itemizedlist>
-          <listitem>
-            <para>Within any of the <emphasis role="bold">F2</emphasis> to <emphasis
-role="bold">F6</emphasis> options, you can view relevant help by pressing
-<emphasis role="bold">F1</emphasis></para>
-          </listitem>
-        </itemizedlist></para>
-
-      <para><itemizedlist>
-          <listitem>
-            <para>Press <emphasis role="bold">F2</emphasis> to have the installer use a
-specific language for the installation.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
-
-            <para>Use the arrow keys to select the language then press <emphasis
-role="bold">Enter</emphasis>.</para>
-          </listitem>
-
-          <listitem>
-            <para>If needed, change the screen resolution by pressing <emphasis
-role="bold">F3</emphasis> (Legacy mode only).</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis role="bold">F6</emphasis> <emphasis
-role="bold">Kernel Options</emphasis> (for UEFI systems press <emphasis
-role="bold">e</emphasis> instead).</para>
-
-            <itemizedlist>
-              <listitem>
-                <para>Default: It doesn't alter anything in the default options.</para>
-              </listitem>
-
-              <listitem>
-                <para>Safe Settings: Priority is given to the safer options at the price of a
-performance detriment.</para>
-              </listitem>
-
-              <listitem>
-                <para>No ACPI: (Advanced Configuration and Power Interface): Power management
-features are not used.</para>
-              </listitem>
-            </itemizedlist>
-
-            <itemizedlist>
-              <listitem>
-                <para>No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU
-interrupt. Select this option if you experience system misbehaviour like a
-kernel panic in relation to APIC.</para>
-              </listitem>
-            </itemizedlist>
-
-            <para>When you select one of these entries, it modifies the default options
-displayed in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <note>
-              <para>In some Mageia releases, it may happen that the entries selected with
-<emphasis role="bold">F6</emphasis> do not appear in the <guilabel>Boot
-Options</guilabel> line, despite this, they will in fact be applied.</para>
-            </note>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
-          </listitem>
-
-          <listitem>
-            <para>Pressing <emphasis role="bold">F1</emphasis> opens a help window for various
-boot options. Select an item with the arrow keys and press <emphasis
-role="bold">Enter</emphasis> for more details or press <emphasis
-role="bold">Esc</emphasis> to go back to the welcome screen.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
-
-            <para>The detailed view about the splash option. Press <emphasis
-role="bold">Esc</emphasis> or select <guilabel>Return to Boot
-Options</guilabel> to go back to the options list. These options can be
-added by hand in the <guilabel>Boot Options</guilabel> line.</para>
-
-            <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
-
-            <note>
-              <para>The help is translated in the chosen language with <emphasis
-role="bold">F2</emphasis>.</para>
-            </note>
-
-            <para>For more information about kernel options on legacy and UEFI systems, see:
-<link
-ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
-          </listitem>
-        </itemizedlist></para>
+        <listitem>
+          <para><emphasis role="bold">Install Mageia</emphasis></para>
+
+          <para>Install Mageia to a hard disk. This is the default option, and will
+automatically start after a short while unless another option is selected.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue System</emphasis></para>
+
+          <para>This option allows you to either re-install the bootloader for an existing
+Mageia installation or you can use it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Memory Test</emphasis></para>
+
+          <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language</emphasis></para>
+
+          <para>Press F2 for alternative languages.</para>
+        </listitem>
+      </itemizedlist>
     </section>
-  </section>
 
-  <section>
-    <title>The installation steps</title>
+    <section>
+      <title>UEFI Systems</title>
 
-    <para>The install process is divided into a number of steps, the status of which
-is indicated in a panel to the left of the screen.</para>
+      <para>From this screen, you can access options by pressing <keycap>e</keycap> to
+enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
+to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
 
-    <para>Each step has one or more screens which may also have
-<guibutton>Advanced</guibutton> sections with extra, less commonly required,
-options.</para>
+      <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
+</imageobject></mediaobject>
 
-    <para>Most screens have <guibutton>Help</guibutton> buttons for further details
-about the particular step.</para>
+      <itemizedlist>
+        <title>Menu</title>
 
-    <note>
-      <para>If at some points during the install you decide to stop the installation, it
-is possible to reboot, but please think twice before you do this. Once a
-partition has been formatted or updates have started to be installed, your
-computer is no longer in the same state and rebooting it could very well
-leave you with an unusable system. If in spite of this you are very sure
-rebooting is what you want, go to a text terminal by pressing the three keys
-<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press
-<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot.</para>
-    </note>
+        <listitem>
+          <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
+re-install the bootloader for an existing Mageia installation or you can use
+it to restore a Windows bootloader.</para>
+        </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Language:</emphasis> Press <keycap>F2</keycap> for
+alternative languages.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you booted from a USB stick, you will see the above options duplicated,
+and in this case, you should use the set that will be suffixed with "USB".</para>
+    </section>
   </section>
 
   <section>
@@ -175,19 +174,20 @@ rebooting is what you want, go to a text terminal by pressing the three keys
 
       <itemizedlist>
         <listitem>
-          <para>After the initial screen you did not reach the language selection
-screen. This can happen with some graphic cards and older systems. Try using
-low resolution by typing <code>vgalo</code> at the prompt.</para>
+          <para>After the initial screen you did not progress to the <emphasis>Language
+Selection</emphasis> screen. This can happen with some graphic cards and
+older systems. Try using low resolution by typing <command>vgalo</command>
+at the prompt.</para>
         </listitem>
 
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
-possible. In this case it is worth trying a text mode installation. To use
-this press <emphasis role="bold">Esc</emphasis> at the first welcome screen
-and confirm with <emphasis role="bold">ENTER</emphasis>. You will be
-presented with a black screen with the word "boot:". Type "text" and press
-<emphasis role="bold">ENTER</emphasis> to continue with the installation in
-text mode.</para>
+possible. In this case it is worth trying a text-mode installation. To use
+this press <keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen
+and confirm with <keycap>ENTER</keycap>. You will be presented with a black
+screen with a <prompt>boot:</prompt> prompt. Type <command>text</command>
+and press <keycap>ENTER</keycap> to continue with the installation in text
+mode.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -196,10 +196,10 @@ text mode.</para>
       <title>The Install Freezes</title>
 
       <para>If the system appeared to freeze during the installation, this may be a
-problem with hardware detection. In this case the automatic detection of
-hardware may be bypassed and dealt with later. To try this, type
-<code>noauto</code> at the prompt. This option may also be combined with
-other options as necessary.</para>
+problem with hardware detection. In this case the automatic hardware
+detection may be bypassed and dealt with later. To try this, type
+<command>noauto</command> at the prompt. This option may also be combined
+with other parameters as necessary.</para>
     </section>
 
     <section>
@@ -207,17 +207,18 @@ other options as necessary.</para>
 
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
-<code>mem=xxxM</code> parameter, where xxx is the correct amount of
-RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
+<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
+<replaceable>xxx</replaceable> is the correct amount of
+RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
 
     <section>
       <title>Dynamic partitions</title>
 
-      <para>If you converted your hard disk from <emphasis role="bold">basic</emphasis>
-format to <emphasis role="bold">dynamic</emphasis> format in Microsoft
-Windows, then it is not possible to install Mageia on this disc. To revert
-to a basic disk, see the Microsoft documentation: <link
+      <para>If you converted your hard disk from <literal>Basic</literal> format to
+<literal>Dynamic</literal> format in Microsoft Windows, then it is not
+possible to install Mageia on this disc. To revert to a
+<literal>Basic</literal> disk, see the Microsoft documentation: <link
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
diff --git a/docs/docs/stable/installer/zh_TW/locale.xml b/docs/docs/stable/installer/zh_TW/locale.xml
new file mode 100644
index 00000000..56a5045d
--- /dev/null
+++ b/docs/docs/stable/installer/zh_TW/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/login.xml b/docs/docs/stable/installer/zh_TW/login.xml
index 5ac9c3c0..601531f4 100644
--- a/docs/docs/stable/installer/zh_TW/login.xml
+++ b/docs/docs/stable/installer/zh_TW/login.xml
@@ -1,6 +1,22 @@
-<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="zh_TW"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
-fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
-yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para><para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para></section>
\ No newline at end of file
+<?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0" xml:lang="zh_TW">
+  
+  <info>
+    <!--2018/03/03 apb: a) Slight adjustment to text and change image caption from KDM to SDDM also change KDE to KDE Plasma. b) update SC to Mga6.-->
+<title xml:id="label-to-adapt-ti1">Login Screen</title>
+  </info>
+  <mediaobject condition="live">
+    <imageobject> <imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/> </imageobject>
+    <caption>
+      <para>SDDM login screen</para>
+    </caption>
+  </mediaobject>
+  <para>Finally, you will come to the desktop login screen.</para>
+  <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE Plasma or GNOME desktop, depending on which live
+medium you used. You can now start using and enjoying your Mageia
+installation.</para>
+  <para>You can find further documentation in <link
+xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the
+Mageia wiki</link>.</para>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/media_selection.xml b/docs/docs/stable/installer/zh_TW/media_selection.xml
index 8f7d5314..4d4c6f23 100644
--- a/docs/docs/stable/installer/zh_TW/media_selection.xml
+++ b/docs/docs/stable/installer/zh_TW/media_selection.xml
@@ -1,6 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="media_selection" version="5.0" xml:lang="zh_TW">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="media_selection"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="media_selection-ti1">Media Selection (Nonfree)</title>
+    <title xml:id="media_selection-ti1">Nonfree Media</title>
   </info>
 
   
@@ -11,14 +18,16 @@
 
   
 
+  
+  
   <mediaobject>
 <!-- papoteur 2013-04-11  - created -->
 <!-- marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)-->
 <!-- marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell -->
 <!--marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)-->
-<imageobject> <imagedata format="PNG" xml:id="media_selection-im1"
-align="center" revision="1" fileref="dx2-media_selection.png"/>
-</imageobject></mediaobject>
+<!--2019.01.05 apb: Changed Ati to AMD in Nonfree para.-->
+<imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
+format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
   <para>Here you have the list of available repositories. Not all repositories are
 available, according to which media you use for installing. The repositories
@@ -35,7 +44,7 @@ the base of the distribution.</para>
       <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
 free-of-charge, i.e. Mageia may redistribute them, but they contain
 closed-source software (hence the name - Nonfree). For example this
-repository includes nVidia and ATI graphics card proprietary drivers,
+repository includes nVidia and AMD graphics card proprietary drivers,
 firmware for various WiFi cards, etc.</para>
     </listitem>
 
diff --git a/docs/docs/stable/installer/zh_TW/minimal-install.xml b/docs/docs/stable/installer/zh_TW/minimal-install.xml
index 3f46fc8c..dea0e42d 100644
--- a/docs/docs/stable/installer/zh_TW/minimal-install.xml
+++ b/docs/docs/stable/installer/zh_TW/minimal-install.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" version="5.0" xml:lang="zh_TW">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="minimal-install" xreflabel="Minimal Install" version="5.0" xml:lang="zh_TW">
   <!--2012-12-26 marja - exported this section from choosePackages.xml to
  start a new page-->
 <!--2013-05-05 marja - added screenshot and s/next/related/ -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/22 apb: Moved 'Minimal Instalation ...' para to top and rework the following paras.-->
+<!--2018/02/22 apb: Added xreflabel to this section.-->
 <info>
     <title xml:id="minimal-install-ti1">Minimal Install</title>
   </info>
@@ -10,26 +13,40 @@
 
   
 
-  <para>You can choose a Minimal Installation by de-selecting everything in the
-Package Group Selection screen, see <xref linkend="choosePackageGroups"/>.</para>
-
-  <para>If desired, you can additionally tick the <emphasis role="bold">Individual
-package selection</emphasis> option in the same screen.</para>
+  
 
-  <para>Minimal Installation is intended for those with specific uses in mind for
-<application>Mageia</application>, such as a server or a specialised
-workstation. You will probably use this option combined with the <emphasis
-role="bold">Individual package selection</emphasis> option mentioned above,
-to fine-tune your installation, see <xref linkend="choosePackagesTree"/>.</para>
+  
 
-  <para>If you choose this installation method, then the relevant screen will offer
-you a few useful extras to install, such as documentation and X.</para>
+  
 
-  <para>If <emphasis role="bold">With X</emphasis> is chosen, then IceWM (a
+  <para>Minimal Installation is intended for those with specific uses in mind for
+Mageia, such as a server or a specialised workstation. You will probably use
+this option combined with the <emphasis>Individual package
+selection</emphasis> option to fine-tune your installation. See <xref
+linkend="choosePackagesTree"/>.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting
+everything in the <emphasis>Package Group Selection</emphasis> screen, see
+<xref linkend="choosePackageGroups"/>.</para>
+
+      <para>If desired, you can additionally tick the <emphasis>Individual package
+selection</emphasis> option in the same screen.</para>
+    </listitem>
+
+    <listitem>
+      <para>If you choose this installation method, then the relevant screen (see
+screenshot below) will offer you a few useful extras to install, such as
+documentation and <quote>X</quote>.</para>
+
+      <para>If the <emphasis>With X</emphasis> option is selected, then IceWM (a
 lightweight desktop environment) will also be included.</para>
+    </listitem>
+  </itemizedlist>
 
-  <para>The basic documentation is provided in the form of man and info pages.  It
-contains the man pages from the <link
+  <para>The basic documentation is provided in the form of <quote>man</quote> and
+<quote>info</quote> pages. It contains the man pages from the <link
 xlink:href="http://www.tldp.org/manpages/man.html">Linux Documentation
 Project</link> and the <link
 xlink:href="http://www.gnu.org/software/coreutils/manual/">GNU
diff --git a/docs/docs/stable/installer/zh_TW/misc-params.xml b/docs/docs/stable/installer/zh_TW/misc-params.xml
index ec66faf9..bc5905e6 100644
--- a/docs/docs/stable/installer/zh_TW/misc-params.xml
+++ b/docs/docs/stable/installer/zh_TW/misc-params.xml
@@ -1,18 +1,34 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_TW" xml:id="misc-params">
   <info>
-    <title xml:id="misc-params-ti1">Summary of miscellaneous parameters</title>
+    <title xml:id="misc-params-ti1">Configuration Summary</title>
   </info>
 
   
 
+  
+
+  
+
+  
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
-<imageobject> <imagedata fileref="dx2-summaryTop.png"/> </imageobject></mediaobject>
+<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
+<!--2018/02/24 apb: Changed list style-->
+<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<imageobject> <imagedata fileref="dx2-summaryTop.png" align="center"/>
+</imageobject></mediaobject>
 
   <para xml:id="misc-params-pa1" revision="1">DrakX presents a proposal for the configuration of your system depending on
 the choices you made and on the hardware detected. You can check the
 settings here and change them if you want by pressing
-<guibutton>Configure</guibutton>.</para>
+<emphasis>Configure</emphasis>.</para>
 
   <note>
     <para>As a general rule, it is recommended that you accept the default settings
@@ -26,7 +42,7 @@ unless:<itemizedlist>
         </listitem>
 
         <listitem>
-          <para>some other factor mentionned in the detailed sections below is an issue.</para>
+          <para>some other factor mentioned in the detailed sections below is an issue</para>
         </listitem>
       </itemizedlist></para>
   </note>
@@ -38,46 +54,47 @@ unless:<itemizedlist>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-system-pa2" revision="1"><guilabel>Timezone</guilabel></para>
+        <para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Timezone</emphasis></para>
 
-        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a time zone for you, depending on your preferred language. You
+        <para xml:id="misc-params-system-pa2a" revision="1">DrakX selects a timezone for you, depending on your preferred language. You
 can change it if needed. See also <xref linkend="configureTimezoneUTC"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Country / Region</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa3"><emphasis role="bold">Country / Region</emphasis></para>
 
         <para xml:id="misc-params-system-pa3a" revision="1">If the selected country is wrong, it is very important that you correct the
 setting.  See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Bootloader</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><emphasis role="bold">Bootloader</emphasis></para>
 
-        <para xml:id="misc-params-system-pa4a" revision="2">DrakX has made good choices for the bootloader setting.</para>
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX proposal for the bootloader setting</para>
 
-        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change anything, unless you know how to configure GRUB2. For more
+information, see <xref linkend="setupBootloader"/></para>
 
-        <para xml:id="misc-params-system-pa4c" revision="2">For more information, see <xref linkend="setupBootloader"/></para>
-      </listitem>
+        
+      <!-- revision="2" xml:id="misc-params-system-pa4c"-->
+</listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>User management</guilabel></para>
+        <para xml:id="misc-params-system-pa5" revision="1"><emphasis role="bold">User management</emphasis></para>
 
-        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each get their own
-<literal>/home</literal> directories.</para>
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra users here. They will each be allocated their own
+<filename>/home</filename> directories.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Services</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><emphasis role="bold">Services</emphasis></para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services refer to those small programs which run in the background
 (daemons).  This tool allows you to enable or disable certain processes.</para>
 
         <para xml:id="misc-params-system-pa6b" revision="1">You should check carefully before changing anything here - a mistake may
-prevent your computer from operating correctly.</para>
-
-        <para>For more information, see <xref linkend="configureServices"/></para>
+prevent your computer from operating correctly. For more information, see
+<xref linkend="configureServices"/></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -89,7 +106,7 @@ prevent your computer from operating correctly.</para>
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Keyboard</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><emphasis role="bold">Keyboard</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">Configure your keyboard layout according to your location, language and type
 of keyboard.</para>
@@ -101,27 +118,32 @@ that your passwords are going to change too.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Mouse</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><emphasis role="bold">Mouse</emphasis></para>
 
         <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add or configure other pointing devices, tablets, trackballs
 etc.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Sound card</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa3" revision="1"><emphasis role="bold">Sound card</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer uses the default driver - if there is a default one. The
-option to select a different driver is only given when there is more than
-one driver for your card, but where none of them is the default one.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">The installer will use the default driver if one is available.</para>
+
+        <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Graphical interface</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa4" revision="1"><emphasis role="bold">Graphical interface</emphasis></para>
 
-        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphic card(s) and displays.</para>
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section allows you to configure your graphics card(s) and displays. For
+more information, see <xref linkend="configureX_chooser"/></para>
 
-        <para xml:id="misc-params-hardware-pa4b" revision="1">For more information, see <xref linkend="configureX_chooser"/>.</para>
-      </listitem>
+        
+      <!--revision="1" xml:id="misc-params-hardware-pa4b"-->
+</listitem>
     </itemizedlist>
 
     <mediaobject>
@@ -136,11 +158,11 @@ align="center" fileref="dx2-summaryBottom.png" revision="1"/> </imageobject></me
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Network</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><emphasis role="bold">Network</emphasis></para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure your network here, but for network cards with non-free
-drivers it is better to do that after reboot, using the <application>Mageia
-Control Center</application>, if you have not yet enabled the Nonfree media
+drivers it is better to do that after reboot, using the Mageia Control
+Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media
 repositories.</para>
 
         <warning>
@@ -150,14 +172,14 @@ that interface as well.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-network-pa4" revision="1"><guilabel>Proxies</guilabel>:</para>
+        <para xml:id="misc-params-network-pa4" revision="1"><emphasis role="bold">Proxies</emphasis></para>
 
         <para xml:id="misc-params-network-pa4a" revision="1">A Proxy Server acts as an intermediary between your computer and the wider
-internet.  This section allows you to configure your computer to utilize a
+Internet.  This section allows you to configure your computer to utilize a
 proxy service.</para>
 
-        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to get the parameters you
-need to enter here.</para>
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to consult your systems administrator to obtain the parameters
+you need to enter here.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -169,26 +191,31 @@ need to enter here.</para>
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Security Level</guilabel>:</para>
+        <para revision="1" xml:id="misc-params-security-pa1"><emphasis role="bold">Security Level</emphasis></para>
 
-        <para xml:id="misc-params-security-pa1a" revision="1">Here you set the Security level for your computer, in most cases the default
-setting (Standard) is adequate for general use.</para>
-
-        <para xml:id="misc-params-security-pa1b" revision="1">Check the option which best suits your usage.</para>
+        <para xml:id="misc-params-security-pa1a" revision="1">The Security level for your computer, in most cases the default setting
+(Standard)  is adequate for general use. Select the option which best suits
+your usage.</para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Firewall</guilabel>:</para>
+        <para xml:id="misc-params-security-pa2" revision="1"><emphasis role="bold">Firewall</emphasis></para>
+
+        <para xml:id="misc-params-security-pa2b" revision="1">The firewall allows you to manage which network connections are allowed on
+your computer. The safe and secure default is to allow ZERO inbound
+connections. This does not stop you connecting outbound and using your
+computer normally.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2a">A firewall is intended to be a barrier between your important data and the
-rascals out there on the internet who would compromise or steal it.</para>
+        <para revision="1">Please be aware that the Internet is a high risk network where there are
+continuous attempts to probe and attack systems. Even seemingly
+<quote>safe</quote> connections such as ICMP (for ping) have been used as
+covert data channels for exfiltrating data by malicious persons.</para>
 
-        <para xml:id="misc-params-security-pa2b" revision="1">Select the services that you wish to have access to your system. Your
-selections will depend on what you use your computer for. For more
-information, see <xref linkend="firewall"/>.</para>
+        <para revision="1">For more information, see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing everything (no firewall) may be very risky.</para>
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may
+be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
diff --git a/docs/docs/stable/installer/zh_TW/reboot.xml b/docs/docs/stable/installer/zh_TW/reboot.xml
index bc455c04..d5213732 100644
--- a/docs/docs/stable/installer/zh_TW/reboot.xml
+++ b/docs/docs/stable/installer/zh_TW/reboot.xml
@@ -1,18 +1,24 @@
 <?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/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="zh_TW" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
+<!--2018/03/03 apb: Slight text adjustment and update PNG's to Mga6.-->
 <info>
     <title xml:id="reboot-ti1">重新開機</title>
   </info>
   
+  
   <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer, click on <emphasis
-role="bold"><guibutton>Finish</guibutton></emphasis> and act as
-asked<emphasis role="bold"> in this order!</emphasis></para>
+computer, remove the live DVD/USB stick and restart the computer.</para>
+  <important>
+    <simpara>Ensure that you follow these shut-down and restart instruction steps in the
+<emphasis role="bold">same</emphasis> order.</simpara>
+  </important>
   <mediaobject>
-<imageobject> <imagedata fileref="live-reboot2.png"/> </imageobject></mediaobject>
-  <para>When you restart, you will see a succession of download progress bars. These
-indicate that the software media lists are being downloaded (see Software
-management).</para>
+<imageobject> <imagedata align="center" fileref="live-reboot2.png"/>
+</imageobject></mediaobject>
+  <simpara>When you are ready, press <emphasis>Finish</emphasis>.</simpara>
+  <simpara>When you restart, you will see a succession of download progress bars. These
+indicate that the software media lists are being downloaded (see
+<emphasis>Software Management</emphasis>).</simpara>
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/docs/stable/installer/zh_TW/securityLevel.xml b/docs/docs/stable/installer/zh_TW/securityLevel.xml
index c6828a4d..70040d50 100644
--- a/docs/docs/stable/installer/zh_TW/securityLevel.xml
+++ b/docs/docs/stable/installer/zh_TW/securityLevel.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_TW" xml:id="securityLevel">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="securityLevel"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="securityLevel-ti1">安全層級</title>
   </info>
@@ -7,27 +14,31 @@
 
   
 
+  
+
   <mediaobject>
 <!-- 2012-12-25 marja - moved this part out of misc-params.xml" -->
 <!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata format="PNG" xml:id="securityLevel-im1"
-align="center" fileref="dx2-securityLevel.png" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/12 apb: Minor wording.-->
+<imageobject> <imagedata align="center" fileref="dx2-securityLevel.png"
+format="PNG" revision="1" xml:id="securityLevel-im1"/> </imageobject></mediaobject>
 
   <para><emphasis role="bold">Please choose the desired security level</emphasis></para>
 
-  <para xml:id="securityLevel-pa1" revision="1"><emphasis role="bold">Standard</emphasis> is the default, and recommended
-setting for the average user. The <emphasis role="bold">Secure</emphasis>
-setting will create a highly protected system - for instance if the system
-is to be used as a public server.</para>
+  <para revision="1" xml:id="securityLevel-pa1"><emphasis>Standard</emphasis> is the default, and recommended setting for
+the average user.</para>
+
+  <para revision="1"><emphasis>Secure</emphasis> will create a highly protected system - for
+instance if the system is to be used as a public server.</para>
 
   <para><emphasis role="bold">Security Administrator</emphasis></para>
 
-  <para xml:id="securityLevel-pa2" revision="1">This item allows you to configure an email address to which the system will
+  <para revision="1" xml:id="securityLevel-pa2">This item allows you to configure an email address to which the system will
 send <emphasis>security alert messages</emphasis> when it detects situations
 which require notification to a system administrator.</para>
 
-  <para>A good, and easy-to-implement, choice is to enter &lt;user>@localhost -
-where &lt;user> is the login name of the user to receive these messages.</para>
+  <para>A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost -
+where &lt;user&gt; is the login name of the user to receive these messages.</para>
 
   <note>
     <para>The system sends such messages as <emphasis role="bold">Unix Mailspool
@@ -35,6 +46,6 @@ messages</emphasis>, not as "ordinary" SMTP mail: this user must therefore
 be configured for receiving such mail!</para>
   </note>
 
-  <para revision="2" xml:id="securityLevel-pa3">After install, it will always be possible to adjust your security settings
-in the <guilabel>Security</guilabel> section of the Mageia Control Center.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="securityLevel-pa3">It will always be possible to adjust your security settings post-install in
+the <emphasis>Security</emphasis> section of the Mageia Control Center.</para>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/selectCountry.xml b/docs/docs/stable/installer/zh_TW/selectCountry.xml
index ac1623fe..fddba46d 100644
--- a/docs/docs/stable/installer/zh_TW/selectCountry.xml
+++ b/docs/docs/stable/installer/zh_TW/selectCountry.xml
@@ -1,27 +1,38 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0" xml:lang="zh_TW">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://docbook.org/ns/transclusion" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" xreflabel="Select Country" version="5.0" xml:lang="zh_TW">
   <info>
     <title xml:id="selectCountry-ti1">Select your Country / Region</title>
   </info>
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
+<!--2018/02/13 apb: Minor wording + typography.-->
+<!--2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.-->
 <imageobject> <imagedata format="PNG" xml:id="selectCountry-im1"
 align="center" fileref="dx2-selectCountry.png" revision="1"/> </imageobject></mediaobject>
 
-  <para revision="2" xml:id="selectCountry-pa1">Select your country or region.  This is important for all kinds of settings,
+  <itemizedlist>
+    <listitem>
+      <para revision="2" xml:id="selectCountry-pa1">Select your country or region. This is important for all kinds of settings,
 like the currency and wireless regulatory domain. Setting the wrong country
-can lead to not being able to use a Wireless network.</para>
+can lead to being unable to use a Wireless network.</para>
+    </listitem>
 
-  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <guilabel>Other
-Countries</guilabel> option and choose your country / region there.</para>
+    <listitem>
+      <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the list, click the <emphasis>Other
+Countries</emphasis> option and choose your country / region there.</para>
+    </listitem>
+  </itemizedlist>
 
   <note>
-    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <guilabel>Other Countries</guilabel> list,
-after clicking <guibutton>OK</guibutton> it may seem that a country from the
-first list was chosen. Please ignore this, as DrakX will apply your actual
-choice.</para>
+    <para revision="1" xml:id="selectCountry-pa3">If your country is only in the <emphasis>Other Countries</emphasis> list,
+after clicking <emphasis>OK</emphasis> it may seem that a country from the
+main list was chosen. Despite this, DrakX will actually apply your choice.</para>
   </note>
 
   <section xml:id="inputMethod">
@@ -29,7 +40,7 @@ choice.</para>
       <title xml:id="inputMethod-ti7">Input method</title>
     </info>
 
-    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other Countries</guilabel> screen you can also select an
+    <para xml:id="selectCountry-pa4" revision="1">In the <emphasis>Other Countries</emphasis> screen you can also select an
 input method (at the bottom of the list). Input methods allow users to input
 multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
 default input method, so users should not need to configure it
@@ -39,9 +50,9 @@ selection.</para>
 
     <note>
       <para xml:id="selectCountry-pa5" revision="1">If you missed the input method setup during installation, you can access it
-after you boot your installed system via <emphasis role="bold">Configure
-your Computer</emphasis> -> <emphasis role="bold">System</emphasis>, or by
-running localedrake as root.</para>
+post-install via <menuchoice> <guimenu>Configure your Computer</guimenu>
+<guimenuitem>System</guimenuitem> </menuchoice>, or by running
+<command>localedrake</command> as <emphasis>root</emphasis>.</para>
     </note>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/selectInstallClass.xml b/docs/docs/stable/installer/zh_TW/selectInstallClass.xml
index b27bce11..52cdf3a0 100644
--- a/docs/docs/stable/installer/zh_TW/selectInstallClass.xml
+++ b/docs/docs/stable/installer/zh_TW/selectInstallClass.xml
@@ -1,4 +1,19 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" 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="zh_TW" xml:id="selectInstallClass">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="selectInstallClass"
+         xmlns="http://docbook.org/ns/docbook"
+         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">
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -16,54 +31,49 @@
       "you will" and "don't" to "do not" and a passive to an active tense, marja, 20120409-->
 <!-- barjac 2012-04-10 In the spirit of KISS reverted to my initial basic version -->
 <!-- 2013-05-05 marja, corrected typo in screenshot name, removed  -->
+<!--2018/02/12 apb: Text and typography.-->
+<!--2018/02/20 apb: a) Changed list style - was bulleted. b) Removed warning about aborting the installation, as this is now at the intro of section 2 (DrakX, the Mageia Installer).-->
+<!--2018/02/24 apb: a) Changed list style.-->
+<!--2019/01/03 apb: a) Install: reword text about retaining an existing /home partition.-->
 <title xml:id="selectInstallClass-ti1">Install or Upgrade</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata format="PNG" align="center"
-fileref="dx2-selectInstallClass.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-selectInstallClass.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <itemizedlist>
+  <itemizedlist spacing="compact">
     <listitem>
-      <para>安裝</para>
+      <para><emphasis role="bold">Install</emphasis></para>
 
-      <para>Use this option to perform a fresh installation of
-<application>Mageia</application>. This will format the root partition (/),
-but can preserve a separated /home partition.</para>
+      <para>Use this option to perform a fresh installation of Mageia. This will format
+the <literal>root</literal> partition (<filename>/</filename>), but can
+preserve a pre-existing <filename>/home</filename> partition (a dedicated
+/home partition, rather than being incorporated within the root (/)
+partition itself).</para>
     </listitem>
 
     <listitem>
-      <para>Upgrade</para>
-
-      <para>This can be used to upgrade an existing installation of
-<application>Mageia</application>.</para>
+      <para><emphasis role="bold">Upgrade</emphasis></para>
 
-      <warning>
-        <para>Only upgrading from a previous Mageia version that was <emphasis>still
-supported</emphasis> when this installer's version was released, has been
-thoroughly tested. If you want to upgrade a Mageia version that has reached
-its End Of Life, then it is better to do a clean install instead while
-preserving your <literal>/home</literal> partition.</para>
-      </warning>
+      <para>Use this option to upgrade an existing installation of Mageia.</para>
     </listitem>
   </itemizedlist>
 
-  <note>
-    <para>If during install you decide to stop the installation, it is possible to
-reboot, but please think twice before you do this. Once a partition has been
-formatted or updates have started to be installed, your computer isn't in
-the same state anymore and rebooting it could very well leave you with an
-unusable system. If in spite of that, and only if you are very sure
-rebooting is what you want, go to a text terminal by pressing <guilabel>Alt
-Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl
-Delete</guilabel> simultaneously to reboot.</para>
-  </note>
+  <important>
+    <para>Only upgrading from a previous Mageia version that was <emphasis>still
+supported</emphasis> when this Installer's version was released, has been
+thoroughly tested. If you want to upgrade a Mageia version that has reached
+its <quote>End Of Life</quote> then it is better to do a
+<quote>clean</quote> install instead, while preserving your
+<filename>/home</filename> partition.</para>
+  </important>
 
   <tip>
     <para>If you have discovered that you forgot to select an additional language, you
-can return from the <emphasis role="bold">Install or Upgrade</emphasis>
-screen to the language choice screen by pressing <guilabel>Alt Ctrl
-Home</guilabel> simultaneously. <emphasis role="bold">Do not</emphasis> do
-this later in the install.</para>
+can return from the <emphasis>Install or Upgrade</emphasis> screen to the
+language choice screen by pressing <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis
+role="bold"> NOT</emphasis> do this later in the install.</para>
   </tip>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/selectKeyboard.xml b/docs/docs/stable/installer/zh_TW/selectKeyboard.xml
index 9344ef32..80e59c8f 100644
--- a/docs/docs/stable/installer/zh_TW/selectKeyboard.xml
+++ b/docs/docs/stable/installer/zh_TW/selectKeyboard.xml
@@ -1,4 +1,17 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectKeyboard" version="5.0" xml:lang="zh_TW">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="selectKeyboard"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
   
 
   
@@ -6,19 +19,22 @@
   <info>
     <!-- Started by marja on 2012 03 31 -->
 <!-- NEEDS TO BE REVIEWED! -->
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/02/19 apb: Updated dx2-selectKeyboard.png to Mga6.-->
+<!--2019/01/03 apb: Minor edit to Note (insert colon).-->
 <title xml:id="selectKeyboard-ti1">鍵盤</title>
   </info>
 
-  <para xml:id="selectKeyboard-pa1" revision="1">DrakX selects an appropriate keyboard for your language. If no suitable
+  <para revision="1" xml:id="selectKeyboard-pa1">DrakX selects an appropriate keyboard for your language. If no suitable
 keyboard is found it will default to a US keyboard layout.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-selectKeyboard.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx2-selectKeyboard.png"/>
 </imageobject></mediaobject>
 
   <itemizedlist>
     <listitem>
-      <para xml:id="selectKeyboard-pa2" revision="1">Make sure that the selection is correct or choose another keyboard
+      <para revision="1" xml:id="selectKeyboard-pa2">Make sure that the selection is correct or choose another keyboard
 layout. If you don't know which layout your keyboard has, look in the
 specifications that came with your system, or ask the computer vendor. There
 may even be a label on the keyboard that identifies the layout. You can also
@@ -27,23 +43,22 @@ xlink:href="http://en.wikipedia.org/wiki/Keyboard_layout">en.wikipedia.org/wiki/
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa3" revision="1">If your keyboard isn't in the list shown, click on
-<guibutton>More</guibutton> to get a fuller list, and select your keyboard
-there.</para>
-
-      <para revision="1"><warning>
-          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <guibutton>More</guibutton> dialog,
-you'll return to the first keyboard choice dialog and it will seem as though
-a keyboard from that screen was chosen. You can safely ignore this and
-continue the installation: the keyboard chosen from the full list will be
-applied.</para>
-        </warning></para>
+      <para revision="1" xml:id="selectKeyboard-pa3">If your keyboard isn't in the list shown, click on <emphasis>More</emphasis>
+to get a fuller list, and select your keyboard there.</para>
+
+      <para revision="1"><note>
+          <para revision="1" xml:id="selectKeyboard-pa5">After choosing a keyboard from the <emphasis>More</emphasis> dialogue,
+you'll return to the first keyboard choice dialogue and it will seem as
+though a keyboard from that screen was chosen. You can safely ignore this
+and continue the installation: the keyboard chosen from the full list will
+be applied.</para>
+        </note></para>
     </listitem>
 
     <listitem>
-      <para xml:id="selectKeyboard-pa4" revision="1">If you choose a keyboard based on non-Latin characters, you will see an
+      <para revision="1" xml:id="selectKeyboard-pa4">If you choose a keyboard based on non-Latin characters, you will see an
 extra dialogue screen asking how you would prefer to switch between the
 Latin and non-Latin keyboard layouts</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/selectKeyboardLive.xml b/docs/docs/stable/installer/zh_TW/selectKeyboardLive.xml
index ac981ca3..78e0b85d 100644
--- a/docs/docs/stable/installer/zh_TW/selectKeyboardLive.xml
+++ b/docs/docs/stable/installer/zh_TW/selectKeyboardLive.xml
@@ -1,14 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_TW" xml:id="selectKeyboardLive">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="selectKeyboardLive"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
   <info>
-    <title xml:id="selectKeyboardLive-ti1">Select keyboard</title>
+    <!--2018/03/01 apb: Slight adjustment to text-->
+<!--2018/03/20 apb: Adjustment to text-->
+<title xml:id="selectKeyboardLive-ti1">Select Keyboard</title>
   </info>
 
   <mediaobject>
-<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
-align="center" format="PNG" fileref="live-selectKeyboard.png"/>
-</imageobject></mediaobject>
-
-  <para>You will be required to set the keyboard layout you wish to use in
-Mageia​​. The default one is selected according to your language and
-timezone previously selected.</para>
-</section>
\ No newline at end of file
+<imageobject> <imagedata align="center" fileref="live-selectKeyboard.png"
+format="PNG" revision="1" xml:id="selectKeyboardLive-im1"/> </imageobject></mediaobject>
+
+  <para>Here you can set the keyboard layout you wish to use with Mageia​​.</para>
+
+  <para>A suggested keyboard layout (highlighted), has been chosen for you based
+upon your previously selected language and timezone choices.</para>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/selectLanguage.xml b/docs/docs/stable/installer/zh_TW/selectLanguage.xml
index 8bc8fec0..0f461f7b 100644
--- a/docs/docs/stable/installer/zh_TW/selectLanguage.xml
+++ b/docs/docs/stable/installer/zh_TW/selectLanguage.xml
@@ -1,4 +1,23 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="zh_TW" xml:id="selectLanguage">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="selectLanguage"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns6="http://www.w3.org/1999/xlink"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns="http://docbook.org/ns/docbook">
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
   
 
   
@@ -17,50 +36,65 @@
        code in figure, marja, 20120409 -->
 <!-- barjac 2012-04-11 - removed image figure tag - and once again had to clean
        up mess made of this header by xxe -->
+<!--2018/09/02 apb: Text and typography. Classical/Live Conditions not respected in HTML or PDF output.-->
+<!--2018/02/17 apb: Changed 'preferred language' Warning tag to Important-->
+<!--2018/02/19 apb: Updated dx2-selectLanguage.png to Mga6.-->
+<!--2018/02/20 apb: Slight reword of 'Choosing more than one language'-->
+<!--2018/02/27 apb: Changed first 3 paras to Itemizedlist-->
+<!--2018/03/11 apb: Test to see if placing condition within listitem - rather than within para - will fix seeing both conditions together in output.-->
 <title xml:id="selectLanguage-ti1">請選擇要使用那個語言。</title>
   </info>
 
-  <para condition="classical">Select your preferred language, by first expanding the list for your
-continent. <application>Mageia</application> will use this selection during
-the installation and for your installed system.</para>
+  <itemizedlist>
+    <listitem condition="classical">
+      <para>Select your preferred language, by first expanding the list for your
+continent. Mageia will use this selection during the installation and for
+your installed system.</para>
+    </listitem>
 
-  <para condition="live">Select your preferred language.  <application>Mageia</application> will use
-this selection during the installation and for your installed system.</para>
+    <listitem condition="live">
+      <para>Select your preferred language. Mageia will use this selection during the
+installation and for your installed system.</para>
+    </listitem>
 
-  <para condition="classical">If it is likely that you (or others) will require several languages to be
-installed on your system, then you should use the <guibutton>Multiple
-languages</guibutton> option to add them now. It will be difficult to add
+    <listitem condition="classical">
+      <para>If it is likely that you (or others) will require several languages to be
+installed on your system, then you should use the <emphasis>Multiple
+languages</emphasis> option to add them now. It will be difficult to add
 extra language support after installation.</para>
+    </listitem>
+  </itemizedlist>
 
   <mediaobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata fileref="live-language.png"
-format=""/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center" fileref="live-language.png"
+format="PNG"/> </imageobject></mediaobject>
 
-  <warning condition="classical">
+  <important condition="classical">
     <para>Even if you choose more than one language, you must first choose one as your
-preferred language in the first language screen. It will also be marked as
-chosen in the multiple languages screen.</para>
-  </warning>
+preferred language from the main list of languages. It will also be marked
+as chosen in the <emphasis>Multiple languages</emphasis> screen.</para>
+  </important>
 
   <itemizedlist>
     <listitem condition="classical">
       <para>If your keyboard language is not the same as your preferred language, then
-it is advisable to install the language of your keyboard as well.</para>
+it is advisable to install the required language for your keyboard as well</para>
     </listitem>
 
     <listitem>
-      <para>Mageia uses UTF-8 (Unicode) support by default.</para>
-
-      <para condition="classical">This may be disabled in the <emphasis role="bold">Multiple
-languages</emphasis> screen if you know that it is inappropriate for your
-language. Disabling UTF-8 applies to all installed languages.</para>
+      <para>Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the
+<emphasis>Multiple languages</emphasis> screen if you know that it is
+inappropriate for your language. Disabling UTF-8 applies to all installed
+languages.</para>
     </listitem>
 
     <listitem>
-      <para>You can change the language of your system after installation in the Mageia
-Control Center -> System -> Manage localization for your system.</para>
+      <para>You can change the language for your system post-installation in the
+<menuchoice> <guimenu>Mageia Control Center</guimenu>
+<guimenuitem>System</guimenuitem> <guimenuitem>localization for your
+system</guimenuitem> </menuchoice>.</para>
     </listitem>
   </itemizedlist>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/selectMouse.xml b/docs/docs/stable/installer/zh_TW/selectMouse.xml
index 74535a89..b51fe271 100644
--- a/docs/docs/stable/installer/zh_TW/selectMouse.xml
+++ b/docs/docs/stable/installer/zh_TW/selectMouse.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectMouse" version="5.0" xml:lang="zh_TW">
-
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="selectMouse"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="selectMouse-ti1">Select mouse</title>
   </info>
@@ -7,25 +13,29 @@
   
 
   
+
   
+
   
+
   
-  
-  
-   <mediaobject>
+
+  <mediaobject>
 <!-- Made by marja on 2012 04 11 -->
 <!-- NEEDS TO BE REVIEWED! -->
 <!-- adding some "real" text now that we know the page shows up in the right place-->
 <!-- marja 2012-04-24 adding screenshot -->
-<imageobject> <imagedata fileref="dx2-selectMouse.png" align="center"
-format="PNG" > </imagedata> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<imageobject> <imagedata align="center" fileref="dx2-selectMouse.png"
+format="PNG"/> </imageobject></mediaobject>
 
   <para revision="2" xml:id="selectMouse-pa1">If you are not happy with how your mouse responds, you can select a
 different one here.</para>
 
- <para revision="2" xml:id="selectMouse-pa2">Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB
-mice</guilabel> is a good choice.</para>
+  <para revision="2" xml:id="selectMouse-pa2">Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and
+USB mice</guimenuitem> </menuchoice> is a good choice.</para>
 
-  <para revision="2" xml:id="selectMouse-pa3">Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to
-configure the buttons that do not work on a mouse with six or more buttons.</para>
+  <para revision="2" xml:id="selectMouse-pa3">Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force
+edev</guimenuitem> </menuchoice> to configure the buttons that do not work
+on a mouse with six or more buttons.</para>
 </section>
diff --git a/docs/docs/stable/installer/zh_TW/setupBootloader.xml b/docs/docs/stable/installer/zh_TW/setupBootloader.xml
index 407d76bd..d6723dee 100644
--- a/docs/docs/stable/installer/zh_TW/setupBootloader.xml
+++ b/docs/docs/stable/installer/zh_TW/setupBootloader.xml
@@ -1,146 +1,198 @@
-<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="zh_TW" xml:id="setupBootloader">
+<?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/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xreflabel="Bootloader" version="5.0" xml:lang="zh_TW" xml:id="setupBootloader">
+  
+  
+  
+  
   
   
   <info>
-    <!---->
-<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
-
+    <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
-<title xml:id="setupBootloader-ti1">開機載入程式主要選項</title>
+<!--2018/02/06 apb: Modified the layout for a (hopefully) easier flow. Also commented-out setupBootloaderAddEntry (was section 24) and incorporated it here, at the end of this file.-->
+<!--2018/02/22 apb: Changed list styles.-->
+<!--2018/02/22 apb: Changed 'Advanced' list style.-->
+<!--2018/02/24 apb: Changed main list style.-->
+<!--2018/02/25 apb: Added xreflabel to this section.-->
+<title xml:id="setupBootloader-ti1">Bootloader</title>
   </info>
   <section>
-    <title>Bootloader interface</title>
-    <para>By default, Mageia uses exclusively:</para>
+    <title>Grub2</title>
     <itemizedlist>
+      <title>Grub2 on Legacy MBR/GPT systems</title>
       <listitem>
-        <para>GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</para>
+        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+bootloader for a Legacy/MBR or Legacy/GPT system.</para>
       </listitem>
       <listitem>
-        <para>GRUB2-efi for a UEFI system.</para>
+        <para>By default, a new bootloader will be written into either the MBR (Master
+Boot Record) of your first hard drive or in the BIOS boot partition.</para>
       </listitem>
     </itemizedlist>
-    <tip>
-      <para>The Mageia graphical menus are nice :)</para>
-    </tip>
-    <section>
-      <title>GRUB2 on Legacy/MBR and Legacy/GPT systems</title>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata xml:id="setupBootloader-im1"
-fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-    <section>
-      <title>GRUB2-efi on UEFI systems</title>
-      <para>With a UEFI system, the user interface is slightly different as you cannot
-choose between the <emphasis role="bold">with</emphasis> or <emphasis
-role="bold">without graphical menu</emphasis> options.</para>
-      <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
-      <para>If Mageia is the only system installed on your computer, the installer
-created an ESP (EFI System Partition) to house the bootloader
-(GRUB2-efi). If there are already UEFI operating systems installed on your
-computer (Windows 8 for example), the Mageia installer detects the existing
-ESP created by Windows and adds GRUB2-efi. Although it is possible to have
-several ESPs, only one is required (and advised), whatever the number of
-operating systems you have.</para>
-      <para>Don't modify the <emphasis role="bold">Boot Device</emphasis> unless you
-really know what you are doing.</para>
-    </section>
-  </section>
-  <section>
-    <title xml:id="setupMageiaBootloader">Using a Mageia bootloader</title>
-    <para>By default, and according to your system, Mageia writes one of the
-following:</para>
     <itemizedlist>
+      <title>Grub2-efi on UEFI systems</title>
       <listitem>
-        <para>a GRUB2 bootloader either into the MBR (Master Boot Record) of your first
-hard drive or in the BIOS boot partition.</para>
+        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
       </listitem>
       <listitem>
-        <para>a GRUB2-efi bootloader into the ESP</para>
+        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+System Partition).</para>
+        <para>If there are already UEFI-based operating systems installed on your computer
+(Windows 8 for example), the Mageia installer will detect the existing ESP
+created by Windows and add grub2-efi to it. If no ESP exists, then one will
+be created. Although it is possible to have several ESPs, only one is
+required, whatever the number of operating systems you have.</para>
       </listitem>
     </itemizedlist>
-    <para>If you already have other operating systems installed, Mageia attempts to
-add them to your new Mageia boot menu. If you don't want this behaviour,
-click on <guibutton>Next</guibutton> and then untick the <emphasis
-role="bold">Probe Foreign OS</emphasis> option.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-setupBootloader3.png"
-align="center"/> </imageobject></mediaobject>
   </section>
   <section>
-    <title>Using an existing bootloader</title>
-    <para>The exact procedure for adding your Mageia system to an existing bootloader
-is beyond the scope of this documentation, however in most cases it will
-involve running the relevant bootloader installation program which should
-detect and add it automatically. See the documentation for the operating
-system in question.</para>
-  </section>
-  <section>
-    <title xml:id="setupChainLoading">Using chain loading</title>
-    <para>If you don't want a bootable Mageia, but to chain-load it from another OS,
-click on <guibutton>Next</guibutton>, then on
-<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP
-or MBR</guilabel>.</para>
-    <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
-    <para>You will get a warning that the bootloader is missing, ignore it by clicking
-<guibutton>OK</guibutton>.</para>
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
-</imageobject></mediaobject>
-  </section>
-  <section>
-    <title>選項</title>
+    <info>
+      <title xml:id="setupBootloader-ti2">Bootloader Setup</title>
+    </info>
     <section>
-      <title>First page</title>
-      <para><itemizedlist><listitem><para><guilabel>Delay before booting the default image</guilabel>: This lets you
-set a delay in seconds before the default operating system is started up.</para></listitem><listitem><para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means a username and password will be required when booting
-to select a booting entry or change settings. The username is <emphasis
-role="bold">root</emphasis> and the password is the one chosen here-after.</para></listitem><listitem><para><guilabel>Password</guilabel>: Choose a password for the bootloader.</para></listitem><listitem><para><guilabel>Password (again)</guilabel>: Retype the password and DrakX will
-check that it matches with the one above.</para></listitem><listitem><para><guilabel>Advanced</guilabel></para><itemizedlist><listitem><para><guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power
-Interface) is a standard for power management. It can save energy by
-stopping unused devices.  Deselecting it could be useful if, for example,
-your computer does not support ACPI or if you think the ACPI implementation
-might cause some problems (for instance random reboots or system lockups).</para></listitem><listitem><para><guilabel>Enable SMP</guilabel>: This option enables/disables symmetric
-multiprocessing for multi core processors.</para></listitem><listitem><para><guilabel>Enable APIC</guilabel>: This gives the operating system access to
-the Advanced Programmable Interrupt Controller. APIC devices permit more
-complex priority models, and Advanced IRQ (Interrupt Request) management.</para></listitem><listitem><para><guilabel>Enable Local APIC</guilabel>: Local APIC manages all external
-interrupts for a specific processor in an SMP system.</para></listitem></itemizedlist></listitem></itemizedlist></para>
+      <title>開機載入程式主要選項</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader.png"
+xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis role="bold">Bootloader to use</emphasis></para>
+          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
+systems will not see this option here.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Boot device</emphasis></para>
+          <para>Don't change this unless you really know what you are doing</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Delay before booting the default image</emphasis></para>
+          <para>This text box lets you set a delay, in seconds, before the default operating
+system is started up.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Security</emphasis></para>
+          <para>This allows you to set a password for the bootloader. This means a username
+and password will be required when booting in order to select a booting
+entry or change settings. This is optional, and most people are not likely
+to have a need for it. The username is <literal>root</literal> and the
+password is the one chosen hereafter.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password</emphasis></para>
+          <para>Choose a password for the bootloader (optional)</para>
+        </listitem>
+        <listitem>
+          <para><emphasis role="bold">Password (again)</emphasis></para>
+          <para>Retype the password and DrakX will check that it matches with the one set
+above</para>
+        </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <itemizedlist>
+        <listitem>
+          <para><emphasis>Enable ACPI</emphasis></para>
+          <para>ACPI (Advanced Configuration and Power Interface) is a standard for power
+management. It can save energy by stopping unused devices. Deselecting it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable SMP</emphasis></para>
+          <para>This option enables/disables symmetric multiprocessing for multi-core
+processors</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable APIC</emphasis></para>
+          <para>Enabling this gives the operating system access to the Advanced Programmable
+Interrupt Controller. APIC devices permit more complex priority models, and
+Advanced IRQ (Interrupt Request)  management.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Enable Local APIC</emphasis></para>
+          <para>Here you can set Local APIC, which manages all external interrupts for a
+specific processor in an SMP system</para>
+        </listitem>
+      </itemizedlist>
     </section>
     <section>
-      <title>Next page</title>
+      <title>Bootloader Configuration</title>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
       <itemizedlist>
         <listitem>
-          <para><guilabel>Default:</guilabel> Operating system started up by default</para>
+          <para><emphasis role="bold">Default</emphasis></para>
+          <para>The operating system to started up by default</para>
         </listitem>
         <listitem>
-          <para><guilabel>Append:</guilabel> This option lets you pass the kernel
-information or tell the kernel to give you more information as it boots.</para>
+          <para><emphasis role="bold">Append</emphasis></para>
+          <para>This option lets you pass information to the kernel or tell the kernel to
+give you more information as it boots</para>
         </listitem>
         <listitem>
-          <para><guilabel>Probe foreign OS</guilabel>: see above <link
-linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><emphasis role="bold">Probe foreign OS</emphasis></para>
+          <para>If you already have other operating systems installed, Mageia attempts to
+add them to your new Mageia boot menu. If you don't want this behaviour,
+then untick the Probe Foreign OS option.</para>
         </listitem>
+      </itemizedlist>
+      <para><emphasis>Advanced</emphasis></para>
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-setupBootloader4.png"/> </imageobject></mediaobject>
+      <itemizedlist>
         <listitem>
-          <para><guilabel>Advanced</guilabel><itemizedlist><listitem><para><guilabel>Video mode:</guilabel> This sets the screen size and colour depth
-to be used by the boot menu. If you click the down triangle you will be
-offered other size and colour depth options.</para></listitem><listitem><para><emphasis role="bold">Do not touch ESP or MBR</emphasis>: see above <link
-linkend="setupChainLoading">Using the chain loading</link></para></listitem></itemizedlist></para>
+          <para><emphasis>Video mode</emphasis></para>
+          <para>This sets the screen size and colour depth to be used by the boot menu. If
+you click the down-triangle you will be offered other size and colour depth
+options.</para>
+        </listitem>
+        <listitem>
+          <para><emphasis>Do not touch ESP or MBR</emphasis></para>
+          <para>Select this option if you don't want a bootable Mageia, but would rather
+chain-load it from another OS. You will get a warning that the bootloader is
+missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
+implications, and wish to proceed.</para>
         </listitem>
       </itemizedlist>
+      <mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"
+align="center"/> </imageobject></mediaobject>
+    </section>
+  </section>
+  <section>
+    <title>Other Options</title>
+    <section>
+      <title>Using an existing bootloader</title>
+      <para>The exact procedure for adding Mageia to an existing bootloader is beyond
+the scope of this documentation. However in most cases it will involve
+running the relevant bootloader installation program, which should detect
+Mageia and automatically add an entry for it in the bootloader menu. See the
+documentation for the relevant operating system.</para>
+    </section>
+    <section>
+      <title>Installing Without a Bootloader</title>
+      <para>While you can opt to install Mageia without a bootloader (see section 2.1
+Advanced), this is not recommended unless you absolutely know what you are
+doing, as without some form of bootloader your operating system will be
+unable to start.</para>
+    </section>
+    <section>
+      <title>Add or Modify a Boot Menu Entry</title>
+      <para>To do this you need to manually edit
+<filename>/boot/grub2/custom.cfg</filename> or use the software
+<application>grub-customizer</application> tool instead (available in the
+Mageia repositories).</para>
+      <note>
+        <para>For more information, see: <link
+ns4:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>
+      </note>
     </section>
   </section>
 </section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/setupSCSI.xml b/docs/docs/stable/installer/zh_TW/setupSCSI.xml
index 74fa2e1d..c6e09c9b 100644
--- a/docs/docs/stable/installer/zh_TW/setupSCSI.xml
+++ b/docs/docs/stable/installer/zh_TW/setupSCSI.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupSCSI" version="5.0" xml:lang="zh_TW">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="setupSCSI"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="setupSCSI-ti1">Setup SCSI</title>
   </info>
@@ -17,6 +24,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 02 -->
 <!-- NEEDS TO BE REVIEWED! -->
@@ -26,15 +37,16 @@
 <!-- marja 2012-04-24 added screenshot -->
 <!-- marja 2012-04-25 replacing John's version 1.6 because that one was based on the
        Mdv doc instead of on our setupSCSI file -->
-<imageobject> <imagedata format="PNG" fileref="dx2-setupSCSI.png"
-align="center" xml:id="setupSCSI-im1" revision="1"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography.-->
+<!--2018/0217 apb: Merge 2nd/3rd paras and reword.-->
+<imageobject> <imagedata align="center" fileref="dx2-setupSCSI.png"
+format="PNG" revision="1" xml:id="setupSCSI-im1"/> </imageobject></mediaobject>
 
   <para revision="3.1" xml:id="setupSCSI-pa1">DrakX will normally detect hard disks correctly. However, with some older
 SCSI controllers it may be unable to determine the correct drivers to use
 and subsequently fail to recognise the drive.</para>
 
-  <para revision="2" xml:id="setupSCSI-pa2">If this happens, you will need to manually tell DrakX which SCSI drive(s)
-you have.</para>
-
-  <para xml:id="setupSCSI-pa3" revision="3">DrakX should then be able to configure the drive(s) correctly.</para>
-</section>
\ No newline at end of file
+  <para revision="2" xml:id="setupSCSI-pa2">If your device is not recognised, you will need to manually tell DrakX which
+SCSI drive(s) you have. DrakX should then be able to configure the drive(s)
+correctly.</para>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/software.xml b/docs/docs/stable/installer/zh_TW/software.xml
new file mode 100644
index 00000000..7d5565c4
--- /dev/null
+++ b/docs/docs/stable/installer/zh_TW/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="zh_TW" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Media Selection</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/zh_TW/soundConfig.xml b/docs/docs/stable/installer/zh_TW/soundConfig.xml
index 27db0f24..f6f882af 100644
--- a/docs/docs/stable/installer/zh_TW/soundConfig.xml
+++ b/docs/docs/stable/installer/zh_TW/soundConfig.xml
@@ -1,40 +1,47 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0" xml:lang="zh_TW">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="soundConfig"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="soundConfig-ti1">聲音設定</title>
   </info>
 
   
 
-  <mediaobject>
-<!-- Lebarhon 20170209 updated SC-->
-<imageobject> <imagedata format="PNG" fileref="dx2-soundConfig.png"
-xml:id="soundConfig-im1" revision="1"/> </imageobject></mediaobject>
-
-  <para>In this screen the name of the driver that the installer chose for your
-sound card is given, which will be the default driver if one exists.</para>
+  
 
-  <para>The default driver should work without problems. However, if after install
-you do encounter problems, then run <command>draksound</command> or start
-this tool via MCC (Mageia Control Center), by choosing the
-<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound
-Configuration</guilabel> at the top right of the screen.</para>
+  
 
-  <para>Then, in the <emphasis role="bold">draksound</emphasis> or <emphasis
-role="bold">Sound Configuration</emphasis> tool screen, click on
-<guibutton>Troubleshooting</guibutton> to find useful advice about how to
-solve the problem.</para>
+  <mediaobject>
+<!-- Lebarhon 20170209 updated SC-->
+<!--2018/02/13 apb: Text and typography.-->
+<!--2018/02/17 apb: Centre-align PNG-->
+<imageobject> <imagedata align="center" fileref="dx2-soundConfig.png"
+format="PNG" revision="1" xml:id="soundConfig-im1"/> </imageobject></mediaobject>
+
+  <para>This screen shows the details of the sound card driver chosen for you by the
+installer, and this driver should work without problems.</para>
+
+  <para>However, if you encounter any issues post-install, then run
+<command>draksound</command> or start this tool via <menuchoice>
+<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem>
+<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the
+<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis>
+screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice
+about how to solve the problem.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">進階</title>
     </info>
 
-    <para>Clicking <emphasis role="bold"><guibutton>Advanced</guibutton></emphasis> in
-this screen, during install, is useful if there is no default driver and
-there are several drivers available, but you think the installer selected
-the wrong one.</para>
-
-    <para>In that case you can select a different driver after clicking on <emphasis
-role="bold"><guibutton>Let me pick any driver</guibutton></emphasis>.</para>
+    <para>If there is no actual default driver for your sound card, there may be other
+possible alternative drivers available to choose from. If this is the case,
+but you think the installer has not made the most appropriate choice, you
+can click on <emphasis>Advanced</emphasis> to manually specify a driver.</para>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/takeOverHdConfirm.xml b/docs/docs/stable/installer/zh_TW/takeOverHdConfirm.xml
index cea01ad3..66d46bb7 100644
--- a/docs/docs/stable/installer/zh_TW/takeOverHdConfirm.xml
+++ b/docs/docs/stable/installer/zh_TW/takeOverHdConfirm.xml
@@ -1,4 +1,11 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="takeOverHdConfirm" version="5.0" xml:lang="zh_TW">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="takeOverHdConfirm"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1999/xhtml"
+         xmlns:ns42="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/1999/xlink"
+         xmlns:ns3="http://www.w3.org/2000/svg"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <info>
     <title xml:id="takeOverHdConfirm-ti1">Confirm hard disk to be formatted</title>
   </info>
@@ -11,6 +18,10 @@
 
   
 
+  
+
+  
+
   <mediaobject>
 <!-- Made by marja on 2012 04 03 -->
 <!-- test comment - johnr -->
@@ -18,15 +29,24 @@
     hard disk." with "if you are not sure about your choice", because I'm sure I
     saw this help screen when I had only one HD -->
 <!-- 2013-05-05 marja added screenshot -->
-<imageobject condition="live"> <imagedata format="PNG"
-fileref="live-takeOverHdConfirm.png" align="center"/> </imageobject>
-<imageobject condition="classical"> <imagedata format="PNG"
-fileref="dx2-takeOverHdConfirm.png" align="center"/> </imageobject></mediaobject>
+<!--2018/02/15 apb: Text and typography-->
+<!--2018/02/20 apb: Change the 2 paras to itemized listitems.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-takeOverHdConfirm.png" format="PNG"/> </imageobject>
+<imageobject condition="live"> <imagedata align="center"
+fileref="live-takeOverHdConfirm.png" format="PNG"/> </imageobject></mediaobject>
 
-  <para xml:id="takeOverHdConfirm-pa1" revision="1">Click on <guibutton>Previous</guibutton> if you are at all unsure about your
+  <itemizedlist>
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa1">Click on <emphasis>Previous</emphasis> if you are at all unsure about your
 choice.</para>
+    </listitem>
 
-  <para xml:id="takeOverHdConfirm-pa2" revision="1">Click on <guibutton>Next</guibutton> to proceed if you are sure that it is
-ok to erase every partition, every operating system and all data that might
-be on that hard disk.</para>
-</section>
\ No newline at end of file
+    <listitem>
+      <para revision="1" xml:id="takeOverHdConfirm-pa2">Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK
+to erase <emphasis role="bold">every</emphasis> partition, <emphasis
+role="bold">every</emphasis> operating system and <emphasis role="bold">all
+data</emphasis> that might be on that hard disk.</para>
+    </listitem>
+  </itemizedlist>
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/testing.xml b/docs/docs/stable/installer/zh_TW/testing.xml
index 6ed6a40b..62e034d6 100644
--- a/docs/docs/stable/installer/zh_TW/testing.xml
+++ b/docs/docs/stable/installer/zh_TW/testing.xml
@@ -5,8 +5,11 @@
          xmlns:ns4="http://www.w3.org/2000/svg"
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
+  
+
   <info>
-    <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Testing Mageia as Live system</title>
   </info>
 
   <section xml:id="testing-1">
@@ -14,20 +17,20 @@
       <title xml:id="testing1-ti1">Live mode</title>
     </info>
 
+    <para>This is the screen you will see if you selected the <emphasis
+role="bold">Boot Mageia </emphasis>option from the Live media menu.</para>
+
     <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
 
-    <para>You get this screen if you selected "Boot Mageia". If not, you get the
-"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
-
     <section>
       <info>
         <title xml:id="testing2-ti1">Testing hardware</title>
       </info>
 
-      <para>One of the Live mode goals is to test if the hardware is correctly managed
-by Mageia. You can check if all devices have a driver in the Hardware
-section of the Mageia Control Center. You can test the most current devices:</para>
+      <para>One of the aims of using the Live mode is to test that your hardware is
+correctly managed by Mageia. You can check if all devices have a driver in
+the Hardware section of the Mageia Control Center:</para>
 
       <itemizedlist>
         <listitem>
@@ -35,11 +38,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>graphical card: if you see the previous screen, it's already OK.</para>
-        </listitem>
-
-        <listitem>
-          <para>webcam:</para>
+          <para>graphics card: if you see the previous screen, it's already OK.</para>
         </listitem>
 
         <listitem>
@@ -47,7 +46,7 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
 
         <listitem>
-          <para>printer: configure it and print a test page</para>
+          <para>printer: configure your printer/s and print a test page</para>
         </listitem>
 
         <listitem>
@@ -55,10 +54,13 @@ section of the Mageia Control Center. You can test the most current devices:</pa
         </listitem>
       </itemizedlist>
 
-      <para>If all is OK for you, you can process to the installation. If not, you can
-leave with the quit button.</para>
+      <para>If everything is satisfactory, you can proceed with the installation. If
+not, you can use the <emphasis>Quit</emphasis> button to exit.</para>
 
-      <remark>The configuration settings you made here are kept for the installation.</remark>
+      <note>
+        <para>The configuration settings you apply here are carried over if you decide to
+proceed with the installation.</para>
+      </note>
     </section>
 
     <section>
@@ -66,15 +68,14 @@ leave with the quit button.</para>
         <title xml:id="testing3-ti1">Launch installation</title>
       </info>
 
+      <para>To launch the installation of the Live DVD to a hard disk or SSD drive,
+simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live
+desktop. You will then see this screen, followed by the <link
+linkend="doPartitionDisks">Partitioning</link> step.</para>
+
       <mediaobject>
 <imageobject> <imagedata fileref="live-liveMode-install.png"/>
 </imageobject></mediaobject>
-
-      <para>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
-SSD drive, simply click on the icon "Install on Hard Disk". You will get
-this screen, and then the "<link
-linkend="doPartitionDisks">Partitioning</link> step" as for the direct
-installation.</para>
     </section>
   </section>
 </section>
diff --git a/docs/docs/stable/installer/zh_TW/uninstall-Mageia.xml b/docs/docs/stable/installer/zh_TW/uninstall-Mageia.xml
index c1bba283..259b513d 100644
--- a/docs/docs/stable/installer/zh_TW/uninstall-Mageia.xml
+++ b/docs/docs/stable/installer/zh_TW/uninstall-Mageia.xml
@@ -1,30 +1,43 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0" xml:lang="zh_TW">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="zh_TW" xml:id="uninstall-Mageia"
+         xmlns="http://docbook.org/ns/docbook"
+         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
+         xmlns:ns4="http://www.w3.org/2000/svg"
+         xmlns:ns3="http://www.w3.org/1999/xhtml"
+         xmlns:ns2="http://www.w3.org/1999/xlink"
+         xmlns:ns="http://docbook.org/ns/docbook">
   <!--Lebarhon 2015-07-06 Not true with UEFI 
 Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
+<!--2018/02/15 apb: Text and typography.-->
 <info>
     <title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
   </info>
 
   
 
+  
+
   <para>If Mageia didn't convince you or you can't install it correctly - in short
 you want get rid of it - that is your right and Mageia also gives you the
 possibility to uninstall. This is not true for every operating system.</para>
 
-  <para>After your data backup, reboot your Mageia installation DVD and select
-<emphasis role="bold">Rescue system</emphasis>, then, <emphasis
-role="bold">Restore Windows boot loader</emphasis>. At the next boot, you
-will only have Windows, with no option to choose your operating system.</para>
+  <para>After backing up your data, reboot your Mageia installation DVD and select
+<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot
+loader</emphasis>. At the next boot, you will only have Windows, with no
+option to choose your Mageia operating system.</para>
 
-  <para>In Windows to recover the space used by Mageia partitions: click on
-<code>Start -> Control Panel -> Administrative Tools -> Computer Management
--> Storage -> Disk Management</code>. You will recognize a Mageia partition
-because they are labeled <guilabel>Unknown</guilabel>, and also by their
-size and place on the disk. Right click on each of these partitions and
-select <guibutton>Delete</guibutton> to free up the space.</para>
+  <para>In Windows, to recover the space used by Mageia partitions: click on
+<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control
+Panel</guimenuitem> <guimenuitem>Administrative Tools</guimenuitem>
+<guimenuitem>Computer Management</guimenuitem>
+<guimenuitem>Storage</guimenuitem> <guimenuitem>Disk
+Management</guimenuitem> </menuchoice>. You will recognise a Mageia
+partition because they are labeled <literal>Unknown</literal>, and also by
+their size and place on the disk. Right-click on each of these partitions
+and select <emphasis>Delete</emphasis> to free up the space.</para>
 
   <para>If you are using Windows XP, you can create a new partition and format it
-(FAT32 or NTFS). It will get a partition letter.</para>
+(FAT32 or NTFS). It will then get a partition letter.</para>
 
   <para>If you have Vista or 7, you have one more possibility, you can extend the
 existing partition that is at the left of the freed space. There are other
@@ -32,4 +45,4 @@ partitioning tools that can be used, such as <emphasis
 role="bold">gparted</emphasis>, available for both Windows and Linux. As
 always, when changing partitions, be very careful to back up anything
 important to you.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/zh_TW/unused.xml b/docs/docs/stable/installer/zh_TW/unused.xml
index 06af4648..a9a0e4d5 100644
--- a/docs/docs/stable/installer/zh_TW/unused.xml
+++ b/docs/docs/stable/installer/zh_TW/unused.xml
@@ -1,27 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="zh_TW" xml:id="unused" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="unused" version="5.0" xml:lang="zh_TW">
   <info>
     <title xml:id="unused-ti1">Keep or delete unused material</title>
   </info>
 
+  
+
   <mediaobject condition="live">
-<imageobject> <imagedata align="center" fileref="live-unused.png"
-format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+<!--2018/03/03 apb: Adjusted text and updated SC's to Mga6.-->
+<imageobject> <imagedata format="PNG" xml:id="unused-im1"
+fileref="live-unused.png" align="center" revision="1"/> </imageobject></mediaobject>
 
   <para>In this step, the installer looks for unused locales packages and unused
-hardware packages. Then it proposes you to delete them. It is a good idea to
-accept, except if you prepare an installation which has to run on different
-hardware.</para>
+hardware packages and you are then given an opportunity to delete them.</para>
+
+  <para>If you do not foresee a case where your installation may need to run on
+different hardware, or that you might need additional localization files
+then you might wish to accept this proposal.</para>
+
+  <para>Clicking <emphasis>Advanced</emphasis> will list the unused hardware and
+localization files that will be removed if you proceed.</para>
 
   <mediaobject>
 <imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
-  <para>The next step is the copying of files on hard disk. This takes some
-minutes. At the end, you get a blank screen for some time, it's normal.</para>
+  <para>The next step is the copying of files to hard disk. This process should just
+take a little while to complete. When it is finishing you will briefly get a
+blank screen - this is normal.</para>
 </section>